diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/SpeedboatEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/SpeedboatEntity.java
index 1581f3bf3..29e982dcd 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/SpeedboatEntity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/SpeedboatEntity.java
@@ -187,6 +187,11 @@ public class SpeedboatEntity extends MobileVehicleEntity implements GeoEntity, I
 
     @Override
     public void baseTick() {
+        turretYRotO = this.getTurretYRot();
+        turretXRotO = this.getTurretXRot();
+        rotorRotO = this.getRotorRot();
+        rudderRotO = this.getRudderRot();
+
         super.baseTick();
 
         if (this.entityData.get(HEAT) > 0) {
@@ -205,11 +210,6 @@ public class SpeedboatEntity extends MobileVehicleEntity implements GeoEntity, I
             this.entityData.set(AMMO, this.getItemStacks().stream().filter(stack -> stack.is(ModItems.HEAVY_AMMO.get())).mapToInt(ItemStack::getCount).sum());
         }
 
-        turretYRotO = this.getTurretYRot();
-        turretXRotO = this.getTurretXRot();
-        rotorRotO = this.getRotorRot();
-        rudderRotO = this.getRudderRot();
-
         Entity driver = this.getFirstPassenger();
         if (driver instanceof Player player) {
             if (this.entityData.get(HEAT) > 100) {
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/WheelChairEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/WheelChairEntity.java
index 9f8df27a0..ea1286e7b 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/WheelChairEntity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/WheelChairEntity.java
@@ -102,7 +102,8 @@ public class WheelChairEntity extends MobileVehicleEntity implements GeoEntity {
 
     @Override
     public void baseTick() {
-        super.baseTick();
+        leftWheelRotO = this.getLeftWheelRot();
+        rightWheelRotO = this.getRightWheelRot();
 
         if (jumpCoolDown > 0 && onGround()) {
             jumpCoolDown--;
@@ -112,8 +113,7 @@ public class WheelChairEntity extends MobileVehicleEntity implements GeoEntity {
             handBusyTime--;
         }
 
-        leftWheelRotO = this.getLeftWheelRot();
-        rightWheelRotO = this.getRightWheelRot();
+        super.baseTick();
 
         this.setDeltaMovement(this.getDeltaMovement().add(0.0, -0.048, 0.0));
         if (this.onGround()) {