diff --git a/src/world/WorldManager.php b/src/world/WorldManager.php
index dc5e0b54c..f925e9c4c 100644
--- a/src/world/WorldManager.php
+++ b/src/world/WorldManager.php
@@ -150,9 +150,9 @@ class WorldManager{
 		}
 
 		$this->server->getLogger()->info($this->server->getLanguage()->translateString("pocketmine.level.unloading", [$world->getDisplayName()]));
-		$safeSpawn = $this->defaultWorld->getSafeSpawn();
+		$safeSpawn = $this->defaultWorld !== null ?  $this->defaultWorld->getSafeSpawn() : null;
 		foreach($world->getPlayers() as $player){
-			if($world === $this->defaultWorld or $this->defaultWorld === null){
+			if($world === $this->defaultWorld or $safeSpawn === null){
 				$player->disconnect("Forced default world unload");
 			}else{
 				$player->teleport($safeSpawn);