diff --git a/apps/openmw/mwrender/player.hpp b/apps/openmw/mwrender/player.hpp
index 29a68ca69..e24f44d68 100644
--- a/apps/openmw/mwrender/player.hpp
+++ b/apps/openmw/mwrender/player.hpp
@@ -95,7 +95,9 @@ namespace MWRender
         /// Restore default camera distance for current mode.
         void setCameraDistance();
 
-        void setAnimation(MWRender::NpcAnimation *anim);
+        void setAnimation(NpcAnimation *anim);
+        NpcAnimation *getAnimation() const
+        { return mAnimation; }
 
         void setHeight(float height);
         float getHeight();
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index ea898e1fa..082b561ef 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -921,7 +921,7 @@ void RenderingManager::setupExternalRendering (MWRender::ExternalRendering& rend
 Animation* RenderingManager::getAnimation(const MWWorld::Ptr &ptr)
 {
     Animation *anim = mActors.getAnimation(ptr);
-    // TODO: Check mObjects too.
+    if(!anim) anim = mPlayer->getAnimation();
     return anim;
 }