diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 8cf3dd1bec..ed09f0f33d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -800,7 +800,13 @@ public class CraftWorld implements World {
                 if (keepLoaded) {
                     loadChunk(chunkCoordX + x, chunkCoordZ + z);
                 } else {
-                    unloadChunk(chunkCoordX + x, chunkCoordZ + z);
+                    if (isChunkLoaded(chunkCoordX + x, chunkCoordZ + z)) {
+                        if (this.getHandle().getChunkAt(chunkCoordX + x, chunkCoordZ + z).isEmpty()) {
+                            unloadChunk(chunkCoordX + x, chunkCoordZ + z, false);
+                        } else {
+                            unloadChunk(chunkCoordX + x, chunkCoordZ + z);
+                        }
+                    }
                 }
             }
         }