diff --git a/addons/hearing/CfgEventHandlers.hpp b/addons/hearing/CfgEventHandlers.hpp
index 310be3675b..8143e2ce0d 100644
--- a/addons/hearing/CfgEventHandlers.hpp
+++ b/addons/hearing/CfgEventHandlers.hpp
@@ -13,15 +13,7 @@ class Extended_PreInit_EventHandlers {
 
 class Extended_PostInit_EventHandlers {
     class ADDON {
-        clientinit = QUOTE(call COMPILE_SCRIPT(XEH_postInit));
-    };
-};
-
-class Extended_Init_EventHandlers {
-    class CAManBase {
-        class GVAR(AddEarPlugs) {
-            serverInit = QUOTE(_this call FUNC(addEarPlugs));
-        };
+        init = QUOTE(call COMPILE_SCRIPT(XEH_postInit));
     };
 };
 
diff --git a/addons/hearing/XEH_postInit.sqf b/addons/hearing/XEH_postInit.sqf
index f8f5c2938f..e6f328ad78 100644
--- a/addons/hearing/XEH_postInit.sqf
+++ b/addons/hearing/XEH_postInit.sqf
@@ -1,5 +1,15 @@
 #include "script_component.hpp"
 
+if (isServer) then {
+    ["CBA_settingsInitialized", {
+        TRACE_1("settingInit - server",GVAR(EnableCombatDeafness));
+        // Only install event handler if combat deafness is enabled
+        if (!GVAR(EnableCombatDeafness)) exitWith {};
+
+        ["CAManBase", "Init", LINKFUNC(addEarPlugs), true, [], true] call CBA_fnc_addClassEventHandler;
+    }] call CBA_fnc_addEventHandler;
+};
+
 if (!hasInterface) exitWith {};
 
 #include "initKeybinds.inc.sqf"