diff --git a/src/Components/Modules/Maps.cpp b/src/Components/Modules/Maps.cpp
index 56e9b606..45f17e66 100644
--- a/src/Components/Modules/Maps.cpp
+++ b/src/Components/Modules/Maps.cpp
@@ -179,6 +179,11 @@ namespace Components
 		_snprintf_s(buffer, size, size, format, mapname);
 	}
 
+	void Maps::HandleAsSPMap()
+	{
+		Maps::IsSPMap = true;
+	}
+
 	void Maps::AddDependency(std::string expression, std::string zone)
 	{
 		// Test expression before adding it
diff --git a/src/Components/Modules/Maps.hpp b/src/Components/Modules/Maps.hpp
index f7bad4ee..4c536dd5 100644
--- a/src/Components/Modules/Maps.hpp
+++ b/src/Components/Modules/Maps.hpp
@@ -10,7 +10,7 @@ namespace Components
 		const char* GetName() { return "Maps"; };
 #endif
 
-		static void HandleAsSPMap() { IsSPMap = true; }
+		static void HandleAsSPMap();
 		static void AddDependency(std::string expression, std::string zone);
 
 		static std::pair<std::string, std::string> GetTeamsForMap(std::string map);
diff --git a/src/Components/Modules/Zones.cpp b/src/Components/Modules/Zones.cpp
index 1d2457ec..61303522 100644
--- a/src/Components/Modules/Zones.cpp
+++ b/src/Components/Modules/Zones.cpp
@@ -1286,10 +1286,12 @@ namespace Components
 	{
 		AssetHandler::ClearRelocations();
 
+		bool patch = (version >= VERSION_ALPHA2);
+		if (patch) Maps::HandleAsSPMap();
+
 		if (Zones::ZoneVersion == version) return;
 		Zones::ZoneVersion = version;
 
-		bool patch = (version >= VERSION_ALPHA2);
 		if (Zones::ZoneVersion == VERSION_ALPHA2 || Zones::ZoneVersion == VERSION_ALPHA3 || Zones::ZoneVersion == VERSION_ALPHA3_DEC || Zones::ZoneVersion == XFILE_VERSION || Zones::ZoneVersion >= 332)
 		{
 			Utils::Hook::Set<DWORD>(0x4158F4, version);
@@ -1344,8 +1346,6 @@ namespace Components
 
 		if (patch)
 		{
-			Maps::HandleAsSPMap();
-
 			Zones::LoadFxElemDefArrayHook.Install();
 			Zones::LoadFxElemDefHook.Install();