diff --git a/src/main/java/eu/crushedpixel/replaymod/entities/CameraEntity.java b/src/main/java/eu/crushedpixel/replaymod/entities/CameraEntity.java
index 8656a27a..2d1a79f7 100755
--- a/src/main/java/eu/crushedpixel/replaymod/entities/CameraEntity.java
+++ b/src/main/java/eu/crushedpixel/replaymod/entities/CameraEntity.java
@@ -52,13 +52,10 @@ public class CameraEntity extends EntityPlayerSP {
 
     private boolean speedup = false;
 
-    private UUID spectating;
+    private static UUID spectating;
 
     public CameraEntity(Minecraft mcIn, World worldIn, NetHandlerPlayClient netHandlerPlayClient, StatFileWriter statFileWriter) {
         super(mcIn, worldIn, netHandlerPlayClient, statFileWriter);
-        if (mc.thePlayer instanceof CameraEntity) {
-            spectating = ((CameraEntity) mc.thePlayer).spectating;
-        }
     }
 
     //frac = time since last tick
@@ -217,6 +214,14 @@ public class CameraEntity extends EntityPlayerSP {
         }
     }
 
+    @Override
+    public void preparePlayerToSpawn() {
+        if (mc.theWorld != null) {
+            worldObj = mc.theWorld;
+        }
+        super.preparePlayerToSpawn();
+    }
+
     @Override
     public boolean isEntityInsideOpaqueBlock() {
         return false;