diff --git a/zone/zone.cpp b/zone/zone.cpp
index 755a98256..8b1639ba4 100644
--- a/zone/zone.cpp
+++ b/zone/zone.cpp
@@ -879,6 +879,8 @@ void Zone::Shutdown(bool quiet)
 		return;
 	}
 
+	DataBucket::DeleteCachedBuckets(DataBucketLoadType::Zone, zone->GetZoneID(), zone->GetInstanceID());
+
 	entity_list.StopMobAI();
 
 	std::map<uint32, NPCType *>::iterator itr;
@@ -934,8 +936,6 @@ void Zone::Shutdown(bool quiet)
 	parse->ReloadQuests(true);
 	UpdateWindowTitle(nullptr);
 
-	DataBucket::DeleteCachedBuckets(DataBucketLoadType::Zone, zone->GetZoneID(), zone->GetInstanceID());
-
 	LogSys.CloseFileLogs();
 
 	if (RuleB(Zone, KillProcessOnDynamicShutdown)) {