diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp
index e606afc0ce..16b93e48b3 100644
--- a/src/ship_cmd.cpp
+++ b/src/ship_cmd.cpp
@@ -330,6 +330,9 @@ static bool CheckShipLeaveDepot(Ship *v)
 		return true;
 	}
 
+	/* Don't leave depot if no destination set */
+	if (v->dest_tile == 0) return true;
+
 	TileIndex tile = v->tile;
 	Axis axis = GetShipDepotAxis(tile);