diff --git a/Server_Install_Pack/@epochhive/epochconfig.hpp b/Server_Install_Pack/@epochhive/epochconfig.hpp
index e7445c37..01073eeb 100644
--- a/Server_Install_Pack/@epochhive/epochconfig.hpp
+++ b/Server_Install_Pack/@epochhive/epochconfig.hpp
@@ -89,6 +89,7 @@ forceRestartTime      = 14400; 			// 4 hour restarts
 	};
 	disableVehicleTIE = "true";
 	ReplaceCarService = "true";		// Replace all "Land_CarService_F" with "paintshop" on the Map on Server Start
+	PaintShopIcons = "false";		// Create MapIcons for PaintShops
 
 // BaseBuilding
 	StorageSlotsLimit 	= 1500; 		// Max storage slots allowed. Warning! Higher the number lower performance.
diff --git a/Sources/epoch_server/init/server_init.sqf b/Sources/epoch_server/init/server_init.sqf
index 6d7478d0..c5864f16 100644
--- a/Sources/epoch_server/init/server_init.sqf
+++ b/Sources/epoch_server/init/server_init.sqf
@@ -195,9 +195,11 @@ if (([_serverSettingsConfig, "ReplaceCarService", false] call EPOCH_fnc_returnCo
 		_x HideobjectGlobal true;
 	} foreach (epoch_centerMarkerPosition nearObjects ["Land_CarService_F", EPOCH_dynamicVehicleArea]);
 };
-{
-	_markers = ["PaintGarage", (getpos _x)] call EPOCH_server_createGlobalMarkerSet;
-} foreach (allmissionobjects "paintshop");
+if (([_serverSettingsConfig, "PaintShopIcons", false] call EPOCH_fnc_returnConfigEntry)) then {
+	{
+		_markers = ["PaintGarage", (getpos _x)] call EPOCH_server_createGlobalMarkerSet;
+	} foreach (allmissionobjects "paintshop");
+};
 
 diag_log "Epoch: Loading vehicles";
 // Vehicle slot limit set to total of all allowed limits