diff --git a/addons/map/XEH_postInitClient.sqf b/addons/map/XEH_postInitClient.sqf
index 8c46744088..a3f377544b 100644
--- a/addons/map/XEH_postInitClient.sqf
+++ b/addons/map/XEH_postInitClient.sqf
@@ -1,5 +1,8 @@
 #include "script_component.hpp"
 
+// Exit on Headless as well
+if !(hasInterface) exitWith {};
+
 LOG(MSG_INIT);
 
 // Calculate the maximum zoom allowed for this map
@@ -18,9 +21,6 @@ call FUNC(determineZoom);
     ((findDisplay 12) displayCtrl 51) ctrlAddEventHandler ["Draw", {[] call FUNC(updateMapEffects);}];
 };
 
-// Client only from here
-if !(hasInterface) exitWith {};
-
 ["SettingsInitialized", {
     // Start Blue Force Tracking if Enabled
     if (GVAR(BFT_Enabled)) then {