diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 2cae306110..5e659ca1d7 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -35,7 +35,7 @@ namespace MWRender
         , mCamera(NULL)
         , mNode(NULL)
     {
-
+        mCharacter.mCell = NULL;
     }
 
     void CharacterPreview::onSetup()
@@ -230,7 +230,7 @@ namespace MWRender
         , mRef(&mBase)
     {
         mBase = *mCharacter.get<ESM::NPC>()->mBase;
-        mCharacter = MWWorld::Ptr(&mRef, mCharacter.getCell());
+        mCharacter = MWWorld::Ptr(&mRef, NULL);
     }
 
     void RaceSelectionPreview::update(float angle)
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index fba08db951..3c49b87390 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -267,6 +267,7 @@ namespace MWWorld
 
         // Rebuild player
         setupPlayer();
+        mPlayer->setCell(NULL);
         MWWorld::Ptr player = mPlayer->getPlayer();
 
         // removes NpcStats, ContainerStore etc