diff --git a/source/Core/Threads/GUIThread.cpp b/source/Core/Threads/GUIThread.cpp
index b07e93bd37..84b4c7bd34 100644
--- a/source/Core/Threads/GUIThread.cpp
+++ b/source/Core/Threads/GUIThread.cpp
@@ -782,19 +782,17 @@ void showDebugMenu(void) {
       // Max deg C limit
       OLED::printNumber(TipThermoModel::getTipMaxInC(), 3, FontStyle::SMALL);
       break;
+#ifdef HALL_SENSOR
     case 13:
       // Print raw hall effect value if availabe, none if hall effect disabled.
-#ifdef HALL_SENSOR
-    {
-      int16_t hallEffectStrength = getRawHallEffect();
-      if (hallEffectStrength < 0)
-        hallEffectStrength = -hallEffectStrength;
-      OLED::printNumber(hallEffectStrength, 6, FontStyle::SMALL);
-    }
-#else
-      OLED::print(translatedString(Tr->OffString), FontStyle::SMALL);
+      {
+        int16_t hallEffectStrength = getRawHallEffect();
+        if (hallEffectStrength < 0)
+          hallEffectStrength = -hallEffectStrength;
+        OLED::printNumber(hallEffectStrength, 6, FontStyle::SMALL);
+      }
+      break;
 #endif
-    break;
     default:
       break;
     }
@@ -805,7 +803,11 @@ void showDebugMenu(void) {
       return;
     else if (b == BUTTON_F_SHORT) {
       screen++;
+#ifdef HALL_SENSOR
       screen = screen % 14;
+#else
+      screen = screen % 13;
+#endif
     }
     GUIDelay();
   }