diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 3dfff66a8..345449ab9 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -869,7 +869,7 @@ static void checkRTCBattery()
 void checkFailsafe()
 {
   for (int i=0; i<NUM_MODULES; i++) {
-    if (isModuleMultimodule(i)){
+    if (isModuleMultimodule(i)) {
       multiModuleStatus.requiresFailsafeCheck = true;
     }
     else if (isModuleFailsafeAvailable(i)) {
diff --git a/radio/src/pulses/modules_helpers.h b/radio/src/pulses/modules_helpers.h
index d80a32860..108be6f57 100644
--- a/radio/src/pulses/modules_helpers.h
+++ b/radio/src/pulses/modules_helpers.h
@@ -346,13 +346,13 @@ inline bool isModuleFailsafeAvailable(uint8_t idx)
     return true;
 #endif
 
+  if (isModuleXJT(idx))
+    return g_model.moduleData[idx].subType == MODULE_SUBTYPE_PXX1_ACCST_D16;
+  
 #if defined(MULTIMODULE)
   if (isModuleMultimodule(idx))
     return multiModuleStatus.isValid() && multiModuleStatus.supportsFailsafe();
 #endif
-  
-  if (isModuleXJT(idx))
-    return g_model.moduleData[idx].subType == MODULE_SUBTYPE_PXX1_ACCST_D16;
 
   if (isModuleR9M(idx))
     return true;