diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 408ed8e1e..3fc862d37 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -1033,7 +1033,7 @@ void checkFailsafe()
   for (int i=0; i<NUM_MODULES; i++) {
     if (IS_MODULE_XJT(i)) {
       ModuleData & moduleData = g_model.moduleData[i];
-      if (moduleData.failsafeMode == FAILSAFE_NOT_SET) {
+      if ((moduleData.rfProtocol == RF_PROTO_X16 || moduleData.rfProtocol == RF_PROTO_LR12) && moduleData.failsafeMode == FAILSAFE_NOT_SET) {
         ALERT(STR_FAILSAFEWARN, STR_NO_FAILSAFE, AU_ERROR);
         break;
       }