diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/world/Scaffold.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/world/Scaffold.kt
index eb3ba9703b7..699221f2250 100644
--- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/world/Scaffold.kt
+++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/world/Scaffold.kt
@@ -541,6 +541,18 @@ object Scaffold : Module("Scaffold", ModuleCategory.WORLD, Keyboard.KEY_I, hideM
             update()
 
             if (rotationMode != "Off" && rotation != null) {
+                val placeRotation = this.placeRotation?.rotation ?: rotation
+
+                val pitch = if (scaffoldMode == "GodBridge" && useStaticRotation) {
+                    if (placeRotation == this.placeRotation?.rotation) {
+                        if (isLookingDiagonally) 75.6f else 73.5f
+                    } else placeRotation.pitch
+                } else {
+                    placeRotation.pitch
+                }
+
+                val targetRotation = Rotation(placeRotation.yaw, pitch).fixedSensitivity()
+
                 val ticks = if (keepRotation) {
                     if (scaffoldMode == "Telly") 1 else keepTicks
                 } else {
@@ -548,7 +560,7 @@ object Scaffold : Module("Scaffold", ModuleCategory.WORLD, Keyboard.KEY_I, hideM
                 }
 
                 if (RotationUtils.resetTicks != 0 || keepRotation) {
-                    setRotation(rotation, ticks)
+                    setRotation(targetRotation, ticks)
                 }
             }
         }
diff --git a/src/main/java/net/ccbluex/liquidbounce/utils/RotationUtils.kt b/src/main/java/net/ccbluex/liquidbounce/utils/RotationUtils.kt
index ddf533a4264..2734ba96f45 100644
--- a/src/main/java/net/ccbluex/liquidbounce/utils/RotationUtils.kt
+++ b/src/main/java/net/ccbluex/liquidbounce/utils/RotationUtils.kt
@@ -500,6 +500,10 @@ object RotationUtils : MinecraftInstance(), Listenable {
             return
         }
 
+        if (applyClientSide) {
+            currentRotation = null
+        }
+
         targetRotation = rotation
 
         rotationData = RotationData(