diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 519216ec9b..9d07aecf3f 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -897,4 +897,10 @@ namespace MWClass
         MWWorld::LiveCellRef<ESM::Creature> *ref = ptr.get<ESM::Creature>();
         return ref->mBase->mAiData.mFight;
     }
+
+    void Creature::adjustScale(const MWWorld::Ptr &ptr, float &scale) const
+    {
+        MWWorld::LiveCellRef<ESM::Creature> *ref = ptr.get<ESM::Creature>();
+        scale *= ref->mBase->mScale;
+    }
 }
diff --git a/apps/openmw/mwclass/creature.hpp b/apps/openmw/mwclass/creature.hpp
index c52e85534b..4b58864489 100644
--- a/apps/openmw/mwclass/creature.hpp
+++ b/apps/openmw/mwclass/creature.hpp
@@ -156,6 +156,8 @@ namespace MWClass
             virtual void restock (const MWWorld::Ptr &ptr) const;
 
             virtual int getBaseFightRating(const MWWorld::Ptr &ptr) const;
+
+            virtual void adjustScale(const MWWorld::Ptr& ptr,float& scale) const;
     };
 }
 
diff --git a/apps/openmw/mwworld/physicssystem.cpp b/apps/openmw/mwworld/physicssystem.cpp
index eecc4a02db..61a3b27f81 100644
--- a/apps/openmw/mwworld/physicssystem.cpp
+++ b/apps/openmw/mwworld/physicssystem.cpp
@@ -754,8 +754,11 @@ namespace MWWorld
 
         if (OEngine::Physic::PhysicActor* act = mEngine->getCharacter(handle))
         {
-            // NOTE: Ignoring Npc::adjustScale (race height) on purpose. This is a bug in MW and must be replicated for compatibility reasons
-            act->setScale(ptr.getCellRef().getScale());
+            float scale = ptr.getCellRef().getScale();
+            if (!ptr.getClass().isNpc())
+                // NOTE: Ignoring Npc::adjustScale (race height) on purpose. This is a bug in MW and must be replicated for compatibility reasons
+                ptr.getClass().adjustScale(ptr, scale);
+            act->setScale(scale);
         }
     }