diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 983480782..2e7f00dd3 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -199,7 +199,7 @@ namespace MWClass
         else
         {
             MWMechanics::DynamicStat<float> fatigue(getCreatureStats(ptr).getFatigue());
-            fatigue.setCurrent(fatigue.getCurrent() - damage);
+            fatigue.setCurrent(fatigue.getCurrent() - damage, true);
             getCreatureStats(ptr).setFatigue(fatigue);
         }
     }
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index e7c10d3c8..5f9b2de47 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -669,7 +669,7 @@ namespace MWClass
         else
         {
             MWMechanics::DynamicStat<float> fatigue(getCreatureStats(ptr).getFatigue());
-            fatigue.setCurrent(fatigue.getCurrent() - damage);
+            fatigue.setCurrent(fatigue.getCurrent() - damage, true);
             getCreatureStats(ptr).setFatigue(fatigue);
         }
     }
diff --git a/apps/openmw/mwmechanics/stat.hpp b/apps/openmw/mwmechanics/stat.hpp
index 65d47c9c0..cb6c09014 100644
--- a/apps/openmw/mwmechanics/stat.hpp
+++ b/apps/openmw/mwmechanics/stat.hpp
@@ -162,14 +162,26 @@ namespace MWMechanics
                 setCurrent (getCurrent()+diff);
             }
 
-            void setCurrent (const T& value)
+            void setCurrent (const T& value, bool allowDecreaseBelowZero = false)
             {
-                mCurrent = value;
+                if (value > mCurrent)
+                {
+                    // increase
+                    mCurrent = value;
 
-                if (mCurrent<0)
+                    if (mCurrent > getModified())
+                        mCurrent = getModified();
+                }
+                else if (value > 0 || allowDecreaseBelowZero)
+                {
+                    // allowed decrease
+                    mCurrent = value;
+                }
+                else if (mCurrent > 0)
+                {
+                    // capped decrease
                     mCurrent = 0;
-                else if (mCurrent>getModified())
-                    mCurrent = getModified();
+                }
             }
 
             void setModifier (const T& modifier)