diff --git a/src/main/java/com/replaymod/replay/mixin/entity_tracking/Mixin_EntityExt.java b/src/main/java/com/replaymod/replay/mixin/entity_tracking/Mixin_EntityExt.java
index 993e9c6e..7b5642eb 100644
--- a/src/main/java/com/replaymod/replay/mixin/entity_tracking/Mixin_EntityExt.java
+++ b/src/main/java/com/replaymod/replay/mixin/entity_tracking/Mixin_EntityExt.java
@@ -3,25 +3,32 @@ package com.replaymod.replay.mixin.entity_tracking;
 import com.replaymod.replay.ext.EntityExt;
 import net.minecraft.entity.Entity;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 
 @Mixin(Entity.class)
 public abstract class Mixin_EntityExt implements EntityExt {
 
-    @Unique
-    private float trackedYaw;
+    @Shadow
+    public float yaw;
+
+    @Shadow
+    public float pitch;
 
     @Unique
-    private float trackedPitch;
+    private float trackedYaw = Float.NaN;
+
+    @Unique
+    private float trackedPitch = Float.NaN;
 
     @Override
     public float replaymod$getTrackedYaw() {
-        return this.trackedYaw;
+        return !Float.isNaN(this.trackedYaw) ? this.trackedYaw : this.yaw;
     }
 
     @Override
     public float replaymod$getTrackedPitch() {
-        return this.trackedPitch;
+        return !Float.isNaN(this.trackedPitch) ? this.trackedPitch : this.pitch;
     }
 
     @Override