diff --git a/addons/accessory/XEH_preInit.sqf b/addons/accessory/XEH_preInit.sqf
index 68e45359e..e8248dc77 100644
--- a/addons/accessory/XEH_preInit.sqf
+++ b/addons/accessory/XEH_preInit.sqf
@@ -1,6 +1,10 @@
 #include "script_component.hpp"
 
-if (!hasInterface) exitWith {};
+ADDON = false;
+
+if (!hasInterface) exitWith {
+    ADDON = true;
+};
 
 #include "XEH_PREP.hpp"
 
@@ -41,3 +45,5 @@ GVAR(usageHash) = createHashMap;
         false
     }
 ] call CBA_fnc_addItemContextMenuOption;
+
+ADDON = true;
diff --git a/addons/diagnostic/XEH_preInit.sqf b/addons/diagnostic/XEH_preInit.sqf
index f72820637..3f09384da 100644
--- a/addons/diagnostic/XEH_preInit.sqf
+++ b/addons/diagnostic/XEH_preInit.sqf
@@ -17,8 +17,6 @@ GVAR(projectileMaxLines) = 20;
 GVAR(projectileStartedDrawing) = false;
 GVAR(projectileTrackedUnits) = [];
 
-ADDON = true;
-
 if (getMissionConfigValue ["EnableTargetDebug", 0] == 1 || {getNumber (configFile >> "EnableTargetDebug") == 1}) then {
     INFO("EnableTargetDebug is enabled.");
 
@@ -71,3 +69,5 @@ if (getMissionConfigValue ["EnableTargetDebug", 0] == 1 || {getNumber (configFil
         }];
     };
 };
+
+ADDON = true;
diff --git a/addons/disposable/XEH_preInit.sqf b/addons/disposable/XEH_preInit.sqf
index fd5954f11..3ee47c035 100644
--- a/addons/disposable/XEH_preInit.sqf
+++ b/addons/disposable/XEH_preInit.sqf
@@ -4,7 +4,9 @@ ADDON = false;
 
 #include "initSettings.inc.sqf"
 
-if (configProperties [configFile >> "CBA_DisposableLaunchers"] isEqualTo []) exitWith {};
+if (configProperties [configFile >> "CBA_DisposableLaunchers"] isEqualTo []) exitWith {
+    ADDON = true;
+};
 
 #include "XEH_PREP.hpp"
 
diff --git a/addons/events/XEH_preInit.sqf b/addons/events/XEH_preInit.sqf
index ddfec7216..f3009be70 100644
--- a/addons/events/XEH_preInit.sqf
+++ b/addons/events/XEH_preInit.sqf
@@ -30,9 +30,10 @@ if (isServer) then {
 #include "backwards_comp.inc.sqf"
 #include "initSettings.inc.sqf"
 
-ADDON = true;
+if (!hasInterface) exitWith {
+    ADDON = true;
+};
 
-if (!hasInterface) exitWith {};
 PREP(playerEvent);
 
 GVAR(skipCheckingUserActions) = true;
@@ -95,3 +96,5 @@ GVAR(alt) = false;
 private _states = [];
 _states resize 20;
 GVAR(userKeyStates) = _states apply {false};
+
+ADDON = true;
diff --git a/addons/help/XEH_preInit.sqf b/addons/help/XEH_preInit.sqf
index 7130d8ddb..1e4c3a98c 100644
--- a/addons/help/XEH_preInit.sqf
+++ b/addons/help/XEH_preInit.sqf
@@ -1,10 +1,12 @@
 //#define DEBUG_MODE_FULL
 #include "script_component.hpp"
 
-if (!hasInterface) exitWith {};
-
 ADDON = false;
 
+if (!hasInterface) exitWith {
+    ADDON = true;
+};
+
 // bwc
 FUNC(help) = BIS_fnc_help;
 
diff --git a/addons/keybinding/XEH_preInit.sqf b/addons/keybinding/XEH_preInit.sqf
index ac5d3e7aa..488c8e76f 100644
--- a/addons/keybinding/XEH_preInit.sqf
+++ b/addons/keybinding/XEH_preInit.sqf
@@ -1,11 +1,13 @@
 #include "script_component.hpp"
 SCRIPT(XEH_preInit);
 
-if (!hasInterface) exitWith {};
+ADDON = false;
 
-#include "XEH_PREP.hpp"
+if (!hasInterface) exitWith {
+    ADDON = true;
+};
 
-ADDON = false;
+#include "XEH_PREP.hpp"
 
 // Load DIK to string conversion table.
 with uiNamespace do {
diff --git a/addons/optics/XEH_preInit.sqf b/addons/optics/XEH_preInit.sqf
index c0297a706..9d3caf567 100644
--- a/addons/optics/XEH_preInit.sqf
+++ b/addons/optics/XEH_preInit.sqf
@@ -6,11 +6,15 @@ ADDON = false;
 
 if (configProperties [configFile >> "CBA_PIPItems"] isEqualTo [] && {
     configProperties [configFile >> "CBA_CarryHandleTypes"] isEqualTo []
-}) exitWith {};
+}) exitWith {
+    ADDON = true;
+};
 
 #include "XEH_PREP.hpp"
 
-if (!hasInterface) exitWith {};
+if (!hasInterface) exitWith {
+    ADDON = true;
+};
 
 #include "initKeybinds.inc.sqf"