diff --git a/zone/zone_save_state.cpp b/zone/zone_save_state.cpp
index 67676af5b..65d20f104 100644
--- a/zone/zone_save_state.cpp
+++ b/zone/zone_save_state.cpp
@@ -418,7 +418,7 @@ bool Zone::LoadZoneState(
 	auto spawn_states = ZoneStateSpawnsRepository::GetWhere(
 		database,
 		fmt::format(
-			"zone_id = {} AND instance_id = {} ORDER BY spawn2_id",
+			"zone_id = {} AND instance_id = {} ORDER BY is_zone DESC, spawn2_id ASC",
 			zoneid,
 			zone->GetInstanceID()
 		)