diff --git a/radio/src/mixer.cpp b/radio/src/mixer.cpp
index cbe00ffc806..93ae267c987 100644
--- a/radio/src/mixer.cpp
+++ b/radio/src/mixer.cpp
@@ -1140,6 +1140,13 @@ void evalMixes(uint8_t tick10ms)
     } else {
       modelFunctionsContext.reset();
     }
+#if defined(OVERRIDE_CHANNEL_FUNCTION)
+    if (!radioGFEnabled() && !modelSFEnabled()) {
+      for (uint8_t i = 0; i < MAX_OUTPUT_CHANNELS; i++) {
+        safetyCh[i] = OVERRIDE_CHANNEL_UNDEFINED;
+      }
+    }
+#endif
   }
 
   //========== LIMITS ===============