diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 19561e53d..a7ff92cf5 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -740,15 +740,6 @@ namespace MWClass
             fatigue.setCurrent(fatigue.getCurrent() - damage, true);
             getCreatureStats(ptr).setFatigue(fatigue);
         }
-
-        if (object.isEmpty())
-        {
-            // Hand-to-hand automatically knocks down when running out of fatigue
-            if (getCreatureStats(ptr).getFatigue().getCurrent() < 0)
-            {
-                getCreatureStats(ptr).setKnockedDown(true);
-            }
-        }
     }
 
     void Npc::setActorHealth(const MWWorld::Ptr& ptr, float health, const MWWorld::Ptr& attacker) const
diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index aadce499e..ba6f0ba04 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -207,6 +207,9 @@ namespace MWMechanics
 
         mDynamic[index] = value;
 
+        if (index == 2 && value.getCurrent() < 0)
+            setKnockedDown(true);
+
         if (index==0 && mDynamic[index].getCurrent()<1)
         {
             if (!mDead)