diff --git a/src/main/java/eu/crushedpixel/replaymod/utils/LegacyKeyframeSetAdapter.java b/src/main/java/eu/crushedpixel/replaymod/utils/LegacyKeyframeSetAdapter.java
index 3b8cbe65..92593139 100644
--- a/src/main/java/eu/crushedpixel/replaymod/utils/LegacyKeyframeSetAdapter.java
+++ b/src/main/java/eu/crushedpixel/replaymod/utils/LegacyKeyframeSetAdapter.java
@@ -53,7 +53,11 @@ public class LegacyKeyframeSetAdapter extends TypeAdapter<KeyframeSet[]> {
                                 spectatedEntityID = in.nextInt();
                             }
                         }
-                        newKeyframe.getValue().setSpectatedEntityID(spectatedEntityID);
+
+                        if(spectatedEntityID != null) {
+                            newKeyframe.getValue().setSpectatedEntityID(spectatedEntityID);
+                        }
+
                         in.endObject();
 
                         keyframes.add(newKeyframe);