diff --git a/api/src/main/java/net/countercraft/movecraft/TrackedLocation.java b/api/src/main/java/net/countercraft/movecraft/TrackedLocation.java
index 7f4e4b408..1be487e0e 100644
--- a/api/src/main/java/net/countercraft/movecraft/TrackedLocation.java
+++ b/api/src/main/java/net/countercraft/movecraft/TrackedLocation.java
@@ -28,7 +28,10 @@ public void rotate(MovecraftRotation rotation, MovecraftLocation origin) {
         MovecraftLocation vector = MathUtils.rotateVec(rotation, absolute.subtract(origin));
 
         MovecraftLocation newAbsolute = origin.add(vector);
-        reset(this.craft, newAbsolute);
+        // Ugly hack, but necessary
+        Craft actualCraft = this.craft;
+        this.craft = null;
+        reset(actualCraft, newAbsolute);
     }
 
     /**