diff --git a/src/general_menus.cpp b/src/general_menus.cpp
index aca85b11a..5e962f6a4 100644
--- a/src/general_menus.cpp
+++ b/src/general_menus.cpp
@@ -269,6 +269,12 @@ void menuProcSetup(uint8_t event)
 #if defined(ROTARY_ENCODERS)
       case ITEM_SETUP_RE_NAVIGATION:
         g_eeGeneral.reNavigation = selectMenuItem(y, STR_RENAVIG, STR_VRENAVIG, g_eeGeneral.reNavigation, 0, 2, attr, event);
+        if (attr && checkIncDec_Ret) {
+          g_rotenc[0] = 0;
+          g_rotenc[1] = 0;
+          p1valdiff = 0;
+          scrollRE = 0;
+        }
         break;
 #endif
 
diff --git a/src/menus.cpp b/src/menus.cpp
index 2904cabd5..54f76b315 100644
--- a/src/menus.cpp
+++ b/src/menus.cpp
@@ -165,6 +165,11 @@ void check_rotary_encoder()
       }
     }
   }
+  else {
+    re1valprev = 0;
+    p1valdiff = 0;
+    scrollRE = 0;
+  }
 }
 #endif