diff --git a/Spigot-Server-Patches/0358-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0358-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
new file mode 100644
index 0000000000..978f6e968b
--- /dev/null
+++ b/Spigot-Server-Patches/0358-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
@@ -0,0 +1,23 @@
+From 742ac3031d1078c6b75cd7c6c2b9de1361d329a7 Mon Sep 17 00:00:00 2001
+From: Spottedleaf <Spottedleaf@users.noreply.github.com>
+Date: Sun, 2 Sep 2018 19:34:33 -0700
+Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
+ chunks
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+index d9766447..3bb86cc5 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+@@ -304,7 +304,7 @@ public class CraftWorld implements World {
+     public boolean loadChunk(int x, int z, boolean generate) {
+         org.spigotmc.AsyncCatcher.catchOp( "chunk load"); // Spigot
+         chunkLoadCount++;
+-        return world.getChunkProviderServer().getChunkAt(x, z, true, generate) != null;
++        return world.getChunkProviderServer().getChunkAt(x, z, true, generate || isChunkGenerated(x, z)) != null; // Paper
+     }
+ 
+     public boolean isChunkLoaded(Chunk chunk) {
+-- 
+2.18.0
+