diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 540b392f6..abd11aaa7 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -246,8 +246,9 @@ namespace MWWorld
 
         // Added by tes3mp
         //
-        // LocalPlayer has unloaded a cell, so send a packet with it
-        mwmp::Main::get().getLocalPlayer()->sendCellUnload(*(*iter)->getCell());
+        // LocalPlayer has unloaded a cell, so send a packet with it, but only if CharGen is over
+        if (mwmp::Main::get().getLocalPlayer()->hasFinishedCharGen())
+            mwmp::Main::get().getLocalPlayer()->sendCellUnload(*(*iter)->getCell());
     }
 
     void Scene::loadCell (CellStore *cell, Loading::Listener* loadingListener, bool respawn)
@@ -315,8 +316,9 @@ namespace MWWorld
 
             // Added by tes3mp
             //
-            // LocalPlayer has loaded a cell, so send a packet with it
-            mwmp::Main::get().getLocalPlayer()->sendCellLoad(*cell->getCell());
+            // LocalPlayer has loaded a cell, so send a packet with it, but only if CharGen is over
+            if (mwmp::Main::get().getLocalPlayer()->hasFinishedCharGen())
+                mwmp::Main::get().getLocalPlayer()->sendCellLoad(*cell->getCell());
         }
 
         mPreloader->notifyLoaded(cell);