diff --git a/AUTHORS.txt b/AUTHORS.txt
index 8ea1eb61c3..b6ced26e82 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -175,6 +175,7 @@ VyMajoris(W-Cephei)<vycanismajoriscsa@gmail.com>
 Walthzer <walthzer.69@gmail.com>
 Winter <simon@agius-muscat.net>
 wizpig64
+YetheSamartaka
 xrufix
 Zakant <Zakant@gmx.de>
-zGuba
+zGuba
\ No newline at end of file
diff --git a/addons/medical_statemachine/Statemachine.hpp b/addons/medical_statemachine/Statemachine.hpp
index 6508b4c34e..39ff12448e 100644
--- a/addons/medical_statemachine/Statemachine.hpp
+++ b/addons/medical_statemachine/Statemachine.hpp
@@ -46,7 +46,7 @@ class ACE_Medical_StateMachine {
         onStateEntered = QFUNC(enteredStateUnconscious);
         class DeathAI {
             targetState = "Dead";
-            condition = QUOTE(!GVAR(AIUnconsciousness) && {!isPlayer _this});
+            condition = QUOTE(!(_this getVariable [ARR_2(QQGVAR(AIUnconsciousness), GVAR(AIUnconsciousness))]) && {!isPlayer _this});
         };
         class WakeUp {
             targetState = "Injured";
diff --git a/addons/zeus/functions/fnc_moduleUnconscious.sqf b/addons/zeus/functions/fnc_moduleUnconscious.sqf
index 9bcec2cdcb..6ee1e8fa60 100644
--- a/addons/zeus/functions/fnc_moduleUnconscious.sqf
+++ b/addons/zeus/functions/fnc_moduleUnconscious.sqf
@@ -38,6 +38,11 @@ if (isNil QEFUNC(medical,setUnconscious)) then {
                 [LSTRING(OnlyAlive)] call FUNC(showMessage);
             } else {
                 private _unconscious = GETVAR(_unit,ACE_isUnconscious,false);
+                if (_unconscious) then {
+                    _unit setVariable [QEGVAR(medical_statemachine,AIUnconsciousness), nil, true];
+                } else {
+                    _unit setVariable [QEGVAR(medical_statemachine,AIUnconsciousness), true, true];
+                };
                 // Function handles locality for me
                 [_unit, !_unconscious, 10e10] call EFUNC(medical,setUnconscious);
             };