diff --git a/src/main/drivers/vtx_common.c b/src/main/drivers/vtx_common.c
index 1f924ed691..763918c9af 100644
--- a/src/main/drivers/vtx_common.c
+++ b/src/main/drivers/vtx_common.c
@@ -116,14 +116,14 @@ bool vtxCommonGetPitmode(uint8_t *pOnoff)
 
 // Utilities
 
-bool vtx58_Freq2Bandchan(uint16_t freq, uint8_t *pBand, uint8_t *pChan)
+bool vtx58_Freq2Bandchan(vtxDevice_t *pVtxDev, uint16_t freq, uint8_t *pBand, uint8_t *pChan)
 {
     uint8_t band;
     uint8_t chan;
 
-    for (band = 0 ; band < 5 ; band++) {
-        for (chan = 0 ; chan < 8 ; chan++) {
-            if (vtx58FreqTable[band][chan] == freq) {
+    for (band = 0 ; band < pVtxDev->numBand ; band++) {
+        for (chan = 0 ; chan < pVtxDev->numChan ; chan++) {
+            if (pVtxDev->freqTable[band * pVtxDev->numChan + chan] == freq) {
                 *pBand = band + 1;
                 *pChan = chan + 1;
                 return true;
diff --git a/src/main/drivers/vtx_common.h b/src/main/drivers/vtx_common.h
index 17aa292d08..685f02bb5f 100644
--- a/src/main/drivers/vtx_common.h
+++ b/src/main/drivers/vtx_common.h
@@ -79,4 +79,4 @@ bool vtxCommonGetBandChan(uint8_t *pBand, uint8_t *pChan);
 bool vtxCommonGetPowerIndex(uint8_t *pIndex);
 bool vtxCommonGetPitmode(uint8_t *pOnoff);
 
-bool vtx58_Freq2Bandchan(uint16_t freq, uint8_t *pBand, uint8_t *pChan);
+bool vtx58_Freq2Bandchan(vtxDevice_t *pVtxDev, uint16_t freq, uint8_t *pBand, uint8_t *pChan);