diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 0b61436d11..c03d132503 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -1427,7 +1427,8 @@ namespace MWClass
                 ptr.getRefData().setCustomData(nullptr);
 
                 // Reset to original position
-                MWBase::Environment::get().getWorld()->moveObject(ptr, ptr.getCellRef().getPosition().asVec3());
+                MWBase::Environment::get().getWorld()->moveObject(
+                    ptr, ptr.getCell()->getOriginCell(ptr), ptr.getCellRef().getPosition().asVec3());
                 MWBase::Environment::get().getWorld()->rotateObject(
                     ptr, ptr.getCellRef().getPosition().asRotationVec3(), MWBase::RotationFlag_none);
             }
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index fca0135e13..61618c001e 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -1354,6 +1354,15 @@ namespace MWWorld
         return {};
     }
 
+    CellStore* MWWorld::CellStore::getOriginCell(const Ptr& object) const
+    {
+        MovedRefTracker::const_iterator found = mMovedHere.find(object.getBase());
+        if (found != mMovedHere.end())
+            return found->second;
+
+        return object.getCell();
+    }
+
     Ptr CellStore::getPtr(ESM::RefId id)
     {
         if (mState == CellStore::State_Unloaded)
diff --git a/apps/openmw/mwworld/cellstore.hpp b/apps/openmw/mwworld/cellstore.hpp
index 126935ace5..59127d6186 100644
--- a/apps/openmw/mwworld/cellstore.hpp
+++ b/apps/openmw/mwworld/cellstore.hpp
@@ -338,6 +338,8 @@ namespace MWWorld
 
         Ptr getMovedActor(int actorId) const;
 
+        CellStore* getOriginCell(const Ptr& object) const;
+
         Ptr getPtr(ESM::RefId id);
 
     private: