diff --git a/addons/medical_engine/XEH_postInit.sqf b/addons/medical_engine/XEH_postInit.sqf
index 55578076296..2514c62254f 100644
--- a/addons/medical_engine/XEH_postInit.sqf
+++ b/addons/medical_engine/XEH_postInit.sqf
@@ -86,12 +86,6 @@
     if (!isNull objectParent _unit && {local objectParent _unit}) exitWith {
         [_unit] call FUNC(lockUnconsciousSeat);
     };
-
-    // Prevent second ragdoll of uncon units when they're killed
-    if (IS_UNCONSCIOUS(_unit) && !isAwake _unit) then {
-        _unit enableSimulation false;
-        [{_this enableSimulation true}, _unit, 2] call CBA_fnc_waitAndExecute;
-    };
 }] call CBA_fnc_addEventHandler;
 
 ["CAManBase", "deleted", {
diff --git a/addons/medical_statemachine/CfgEventHandlers.hpp b/addons/medical_statemachine/CfgEventHandlers.hpp
index 98c29f77dc8..b9150d85640 100644
--- a/addons/medical_statemachine/CfgEventHandlers.hpp
+++ b/addons/medical_statemachine/CfgEventHandlers.hpp
@@ -10,6 +10,12 @@ class Extended_PreInit_EventHandlers {
     };
 };
 
+class Extended_PostInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_SCRIPT(XEH_postInit));
+    };
+};
+
 class Extended_Respawn_EventHandlers {
     class CAManBase {
         class ADDON {
diff --git a/addons/medical_statemachine/XEH_postInit.sqf b/addons/medical_statemachine/XEH_postInit.sqf
new file mode 100644
index 00000000000..a7c7740a390
--- /dev/null
+++ b/addons/medical_statemachine/XEH_postInit.sqf
@@ -0,0 +1,14 @@
+#include "script_component.hpp"
+
+["ace_killed", { // global event
+    params ["_unit"];
+
+    // Prevent second ragdoll of uncon units when they're killed
+    if (
+        IS_UNCONSCIOUS(_unit) && !isAwake _unit // uncon and not ragdolling
+        && {isPlayer _unit || {_unit getVariable [QGVAR(AIUnconsciousness), GVAR(AIUnconsciousness)]}}
+    ) then {
+        _unit enableSimulation false;
+        [{_this enableSimulation true}, _unit, 2] call CBA_fnc_waitAndExecute;
+    };
+}] call CBA_fnc_addEventHandler;
diff --git a/addons/medical_status/functions/fnc_setDead.sqf b/addons/medical_status/functions/fnc_setDead.sqf
index 9dfc07d1144..cb1e1f1d6f8 100644
--- a/addons/medical_status/functions/fnc_setDead.sqf
+++ b/addons/medical_status/functions/fnc_setDead.sqf
@@ -17,10 +17,14 @@
 params ["_unit", ["_reason", "#setDead"], ["_instigator", objNull]];
 TRACE_3("setDead",_unit,_reason,_instigator);
 
+
 // No heart rate or blood pressure to measure when dead
 _unit setVariable [VAR_HEART_RATE, 0, true];
 _unit setVariable [VAR_BLOOD_PRESS, [0, 0], true];
 
+// Clear uncon variable just to be safe
+_unit setVariable [VAR_UNCON, nil, true];
+
 _unit setVariable [QEGVAR(medical,causeOfDeath), _reason, true];
 
 // Send a local event before death