diff --git a/Sources/epoch_code/compile/setup/masterLoop/init.sqf b/Sources/epoch_code/compile/setup/masterLoop/init.sqf
index c58938af..1b4f26aa 100644
--- a/Sources/epoch_code/compile/setup/masterLoop/init.sqf
+++ b/Sources/epoch_code/compile/setup/masterLoop/init.sqf
@@ -1,6 +1,9 @@
 // make sure we wait for Display #46
 waitUntil {!(isNull (findDisplay 46))};
 
+// disable fuel sources client side.
+{_x setFuelCargo 0;} foreach (missionNamespace getVariable ["EPOCH_staticFuelSources", []]);
+
 // setup display EH's
 if (isNil "EPOCH_display_setup_complete") then {
     EPOCH_display_setup_complete = true;
diff --git a/Sources/epoch_code/init/client_init.sqf b/Sources/epoch_code/init/client_init.sqf
index cb2509ae..88f9b1a9 100644
--- a/Sources/epoch_code/init/client_init.sqf
+++ b/Sources/epoch_code/init/client_init.sqf
@@ -73,9 +73,6 @@ EPOCH_maxBuildingHeight = getNumber(_CfgEpochClient >> "maxBuildingHeight");
 //ON INIT and RESPAWN
 call EPOCH_clientInit;
 
-// disable fuel sources client side.
-{_x setFuelCargo 0;} foreach (missionNamespace getVariable ["EPOCH_staticFuelSources", []]);
-
 [] execFSM "epoch_code\system\SPVEH.fsm";
 [] execFSM "epoch_code\system\player_login.fsm";