diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/ServerWorldTracker.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/ServerWorldTracker.kt
index 9bb2c236..c50132a2 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/ServerWorldTracker.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/ServerWorldTracker.kt
@@ -391,7 +391,7 @@ class ServerWorldTracker(val world: ServerWorld, val client: ServerConnection, p
 
 			if (playerEntity != null && (world.worldID is WorldID.Celestial || world.worldID is WorldID.ShipWorld && world.worldID.uuid == client.uuid) && setReturnWarp) {
 				client.returnWarp = WarpAction.World(world.worldID, SpawnTarget.Position(playerEntity.position))
-			} else if (setReturnWarp) {
+			} else if (setReturnWarp && world.worldID is WorldID.ShipWorld) {
 				client.returnWarp = null
 			}