diff --git a/src/Components/Modules/AssetHandler.cpp b/src/Components/Modules/AssetHandler.cpp
index 3dca7da8..29bb01c4 100644
--- a/src/Components/Modules/AssetHandler.cpp
+++ b/src/Components/Modules/AssetHandler.cpp
@@ -122,6 +122,11 @@ namespace Components
 			asset.material->sortKey = 0xE;
 		}
 
+		if (type == Game::XAssetType::ASSET_TYPE_VEHICLE && Zones::Version() >= VERSION_ALPHA2)
+		{
+			asset.vehicle->weaponDef = nullptr;
+		}
+
 		// Fix shader const stuff
 		if (type == Game::XAssetType::ASSET_TYPE_TECHSET && Zones::Version() >= 359)
 		{
diff --git a/src/Components/Modules/Maps.cpp b/src/Components/Modules/Maps.cpp
index ad1cb40f..4b03e55c 100644
--- a/src/Components/Modules/Maps.cpp
+++ b/src/Components/Modules/Maps.cpp
@@ -152,12 +152,6 @@ namespace Components
 			*restrict = true;
 			return;
 		}
-
-		if (type == Game::XAssetType::ASSET_TYPE_VEHICLE && Zones::Version() >= VERSION_ALPHA2)
-		{
-			*restrict = true;
-			return;
-		}
 	}
 
 	Game::GameMap_Data* Maps::GetWorldData()