diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h
index 41e1cf51f..cd7558271 100644
--- a/companion/src/eeprominterface.h
+++ b/companion/src/eeprominterface.h
@@ -1376,8 +1376,6 @@ class EEPROMInterface
 
     virtual int getSize(const GeneralSettings &) = 0;
 
-    virtual int isAvailable(PulsesProtocol proto, int port=0) = 0;
-
     virtual const int getEEpromSize() = 0;
 
     virtual const int getMaxModels() = 0;
@@ -1613,6 +1611,8 @@ class Firmware {
 
     virtual bool isTelemetrySourceAvailable(int source) = 0;
 
+    virtual int isAvailable(PulsesProtocol proto, int port=0) = 0;
+
   public:
     QList<const char *> languages;
     QList<const char *> ttslanguages;
diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
index 3009b37a6..0e6d74e22 100644
--- a/companion/src/firmwares/opentx/opentxinterface.cpp
+++ b/companion/src/firmwares/opentx/opentxinterface.cpp
@@ -818,7 +818,7 @@ bool OpenTxFirmware::isTelemetrySourceAvailable(int source)
   return true;
 }
 
-int OpenTxEepromInterface::isAvailable(PulsesProtocol proto, int port)
+int OpenTxFirmware::isAvailable(PulsesProtocol proto, int port)
 {
   if (IS_TARANIS(board)) {
     switch (port) {
diff --git a/companion/src/firmwares/opentx/opentxinterface.h b/companion/src/firmwares/opentx/opentxinterface.h
index e2f249ecb..41c1bf6a2 100644
--- a/companion/src/firmwares/opentx/opentxinterface.h
+++ b/companion/src/firmwares/opentx/opentxinterface.h
@@ -45,8 +45,6 @@ class OpenTxEepromInterface : public EEPROMInterface
 
     virtual int getSize(const GeneralSettings &);
 
-    virtual int isAvailable(PulsesProtocol proto, int port=0);
-
   protected:
 
     const char * getName();
@@ -123,6 +121,8 @@ class OpenTxFirmware: public Firmware {
 
     virtual bool isTelemetrySourceAvailable(int source);
 
+    virtual int isAvailable(PulsesProtocol proto, int port=0);
+
   protected:
 
     QString getFirmwareBaseUrl();