diff --git a/addons/respawn/CfgEventHandlers.hpp b/addons/respawn/CfgEventHandlers.hpp
index a4601c6f95..481d36cf30 100644
--- a/addons/respawn/CfgEventHandlers.hpp
+++ b/addons/respawn/CfgEventHandlers.hpp
@@ -14,6 +14,7 @@ class Extended_PreInit_EventHandlers {
 class Extended_PostInit_EventHandlers {
     class ADDON {
         init = QUOTE(call COMPILE_FILE(XEH_postInit));
+        serverInit = QUOTE(call COMPILE_FILE(XEH_serverPostInit));
     };
 };
 
diff --git a/addons/respawn/XEH_serverPostInit.sqf b/addons/respawn/XEH_serverPostInit.sqf
new file mode 100644
index 0000000000..d472bb0d5c
--- /dev/null
+++ b/addons/respawn/XEH_serverPostInit.sqf
@@ -0,0 +1,17 @@
+#include "script_component.hpp"
+
+["SettingsInitialized", {
+    if (GVAR(RemoveDeadBodiesDisconnected)) then {
+        addMissionEventHandler ["HandleDisconnect", {
+            [{
+                params ["_unit"];
+
+                if (!alive _unit) then {
+                    deleteVehicle _unit;
+                };
+            },
+            _this, 4] call EFUNC(common,waitAndExecute);
+            false
+        }];
+    };
+}] call EFUNC(common,addEventHandler);
diff --git a/addons/respawn/functions/fnc_module.sqf b/addons/respawn/functions/fnc_module.sqf
index ea6ba555d5..bc4f197c07 100644
--- a/addons/respawn/functions/fnc_module.sqf
+++ b/addons/respawn/functions/fnc_module.sqf
@@ -19,25 +19,9 @@
 
 params ["_logic", "_units", "_activated"];
 
-if !(_activated) exitWith {};
+if (!_activated) exitWith {};
 
-GVAR(Module) = true;
-
-[_logic, QGVAR(SavePreDeathGear),             "SavePreDeathGear"]             call EFUNC(common,readSettingFromModule);
+[_logic, QGVAR(SavePreDeathGear), "SavePreDeathGear"] call EFUNC(common,readSettingFromModule);
 [_logic, QGVAR(RemoveDeadBodiesDisconnected), "RemoveDeadBodiesDisconnected"] call EFUNC(common,readSettingFromModule);
 
-if (isServer && {GVAR(RemoveDeadBodiesDisconnected)}) then {
-    addMissionEventHandler ["HandleDisconnect", {
-        [{
-            params ["_unit"];
-
-            if (!alive _unit) then {
-                deleteVehicle _unit;
-            };
-        },
-        _this, 4] call EFUNC(common,waitAndExecute);
-        false
-    }];
-};
-
 ACE_LOGINFO("Respawn Module Initialized.");