diff --git a/firmware/production/production.ino b/firmware/production/production.ino
index 1350e0f..56c6a4e 100644
--- a/firmware/production/production.ino
+++ b/firmware/production/production.ino
@@ -318,7 +318,8 @@ void initialisePMW3360(void) {
 
   // Rotate the x and y results, since the sensor isn't quite squared up in
   // the enclosure.
-  adnsWriteReg(ANGLE_TUNE, ROTATIONAL_TRANSFORM_ANGLE);
+  // Sensor rotates up to +/-30 degrees
+  adnsWriteReg(ANGLE_TUNE, constrain(ROTATIONAL_TRANSFORM_ANGLE, -30, 30));
 
   adnsComEnd();