diff --git a/src/api/java/baritone/api/Settings.java b/src/api/java/baritone/api/Settings.java
index d7086dad4..46a7f62e2 100644
--- a/src/api/java/baritone/api/Settings.java
+++ b/src/api/java/baritone/api/Settings.java
@@ -745,16 +745,10 @@ public final class Settings {
      * Forces the client-sided yaw rotation to an average of the last {@link #smoothLookTicks} of server-sided rotations.
      * Requires {@link #freeLook}.
      */
-    public final Setting<Boolean> smoothLookYaw = new Setting<>(false);
+    public final Setting<Boolean> smoothLook = new Setting<>(false);
 
     /**
-     * Forces the client-sided pitch rotation to an average of the last {@link #smoothLookTicks} of server-sided rotations.
-     * Requires {@link #freeLook}.
-     */
-    public final Setting<Boolean> smoothLookPitch = new Setting<>(false);
-
-    /**
-     * The number of ticks to average across for {@link #smoothLookYaw} and {@link #smoothLookPitch};
+     * The number of ticks to average across for {@link #smoothLook};
      */
     public final Setting<Integer> smoothLookTicks = new Setting<>(10);
 
diff --git a/src/main/java/baritone/behavior/LookBehavior.java b/src/main/java/baritone/behavior/LookBehavior.java
index 5f6421d08..869b8efb8 100644
--- a/src/main/java/baritone/behavior/LookBehavior.java
+++ b/src/main/java/baritone/behavior/LookBehavior.java
@@ -112,12 +112,15 @@ public final class LookBehavior extends Behavior implements ILookBehavior {
                         this.smoothPitchBuffer.pop();
                     }
 
-                    ctx.player().rotationYaw = Baritone.settings().smoothLookYaw.value
-                            ? (float) this.smoothYawBuffer.stream().mapToDouble(d -> d).average().orElseGet(this.prevRotation::getYaw)
-                            : this.prevRotation.getYaw();
-                    ctx.player().rotationPitch = Baritone.settings().smoothLookPitch.value
-                            ? (float) this.smoothPitchBuffer.stream().mapToDouble(d -> d).average().orElseGet(this.prevRotation::getPitch)
-                            : this.prevRotation.getPitch();
+                    if (Baritone.settings().freeLook.value) {
+                        ctx.player().rotationYaw = this.prevRotation.getYaw();
+                        ctx.player().rotationPitch = this.prevRotation.getPitch();
+                    } else if (Baritone.settings().smoothLook.value) {
+                        ctx.player().rotationYaw = (float) this.smoothYawBuffer.stream().mapToDouble(d -> d).average().orElseGet(this.prevRotation::getYaw);
+                        ctx.player().rotationPitch = ctx.player().isElytraFlying()
+                                ? (float) this.smoothPitchBuffer.stream().mapToDouble(d -> d).average().orElseGet(this.prevRotation::getPitch)
+                                : this.prevRotation.getPitch();
+                    }
 
                     this.prevRotation = null;
                 }
@@ -327,12 +330,10 @@ public final class LookBehavior extends Behavior implements ILookBehavior {
                 final boolean blockFreeLook = settings.blockFreeLook.value;
                 final boolean freeLook = settings.freeLook.value;
 
-                if (!freeLook) return CLIENT;
+                if (!freeLook && !settings.smoothLook.value) return CLIENT;
                 if (!blockFreeLook && blockInteract) return CLIENT;
 
-                if (ctx.player().isElytraFlying()) {
-                    return settings.elytraFreeLook.value ? SERVER : CLIENT;
-                }
+
 
                 // Regardless of if antiCheatCompatibility is enabled, if a blockInteract is requested then the player
                 // rotation needs to be set somehow, otherwise Baritone will halt since objectMouseOver() will just be