diff --git a/src/main/java/eu/crushedpixel/replaymod/entities/CameraEntity.java b/src/main/java/eu/crushedpixel/replaymod/entities/CameraEntity.java
index 8385c8b6..5cff2b60 100755
--- a/src/main/java/eu/crushedpixel/replaymod/entities/CameraEntity.java
+++ b/src/main/java/eu/crushedpixel/replaymod/entities/CameraEntity.java
@@ -52,7 +52,7 @@ public class CameraEntity extends EntityPlayerSP {
 
     private boolean speedup = false;
 
-    private static UUID spectating;
+    public static UUID spectating;
 
     public CameraEntity(Minecraft mcIn, World worldIn, NetHandlerPlayClient netHandlerPlayClient, StatFileWriter statFileWriter) {
         super(mcIn, worldIn, netHandlerPlayClient, statFileWriter);
diff --git a/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java b/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java
index dda32de5..6198c960 100755
--- a/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java
+++ b/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java
@@ -478,6 +478,8 @@ public class ReplayHandler {
             mc.loadWorld(null);
         }
 
+        CameraEntity.spectating = null;
+
         inReplay = false;
         lastExit = System.currentTimeMillis();