diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
index 4e44c8421..2cf1b3b1a 100644
--- a/companion/src/firmwares/opentx/opentxinterface.cpp
+++ b/companion/src/firmwares/opentx/opentxinterface.cpp
@@ -909,17 +909,25 @@ bool OpenTxEepromInterface::checkVariant(unsigned int version, unsigned int vari
     }
     variantError = true;
   }
-  else if (IS_TARANIS_X9E(board) && variant != TARANIS_X9E_VARIANT) {
-    variantError = true;
+  else if (IS_TARANIS_X9E(board)) {
+    if (variant != TARANIS_X9E_VARIANT) {
+      variantError = true;
+    }
   }
-  else if (IS_TARANIS_X7(board) && variant != TARANIS_X7_VARIANT) {
-    variantError = true;
+  else if (IS_TARANIS_X7(board)) {
+    if (variant != TARANIS_X7_VARIANT) {
+      variantError = true;
+    }
   }
-  else if (IS_TARANIS_XLITE(board) && variant != TARANIS_XLITE_VARIANT) {
-    variantError = true;
+  else if (IS_TARANIS_XLITE(board)) {
+    if (variant != TARANIS_XLITE_VARIANT) {
+      variantError = true;
+    }
   }
-  else if (IS_TARANIS(board) && variant != 0) {
-    variantError = true;
+  else if (IS_TARANIS(board)) {
+    if (variant != 0) {
+      variantError = true;
+    }
   }
 
   if (variantError) {