diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 97b0767faf..2b1cbe4c72 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -563,6 +563,10 @@ namespace MWWorld
 
     Ptr World::searchPtrViaActorId (int actorId)
     {
+        // The player is not registered in any CellStore so must be checked manually
+        if (actorId == getPlayerPtr().getClass().getCreatureStats(getPlayerPtr()).getActorId())
+            return getPlayerPtr();
+        // Now search cells
         return mWorldScene->searchPtrViaActorId (actorId);
     }