diff --git a/src/js/utils/VtxDeviceStatus/Rtc6705DeviceStatus.js b/src/js/utils/VtxDeviceStatus/Rtc6705DeviceStatus.js
index 8a5f600196..5607e3a5f2 100644
--- a/src/js/utils/VtxDeviceStatus/Rtc6705DeviceStatus.js
+++ b/src/js/utils/VtxDeviceStatus/Rtc6705DeviceStatus.js
@@ -1,5 +1,4 @@
 import VtxDeviceStatus, { VtxDeviceTypes } from './VtxDeviceStatus';
-import vtxDeviceStatusFactory from './VtxDeviceStatusFactory';
 
 class VtxDeviceStatusRtc6705 extends VtxDeviceStatus {
     constructor(dataView)
@@ -17,6 +16,4 @@ class VtxDeviceStatusRtc6705 extends VtxDeviceStatus {
     }
 }
 
-vtxDeviceStatusFactory.registerVtxDeviceStatusClass(VtxDeviceStatusRtc6705);
-
 export default VtxDeviceStatusRtc6705;
diff --git a/src/js/utils/VtxDeviceStatus/SmartAudioDeviceStatus.js b/src/js/utils/VtxDeviceStatus/SmartAudioDeviceStatus.js
index 280c9dbfbc..f890176af6 100644
--- a/src/js/utils/VtxDeviceStatus/SmartAudioDeviceStatus.js
+++ b/src/js/utils/VtxDeviceStatus/SmartAudioDeviceStatus.js
@@ -1,5 +1,4 @@
 import VtxDeviceStatus, { VtxDeviceTypes } from "./VtxDeviceStatus";
-import vtxDeviceStatusFactory from "./VtxDeviceStatusFactory";
 import { i18n } from "../../localization";
 
 class VtxDeviceStatusSmartAudio extends VtxDeviceStatus {
@@ -48,6 +47,4 @@ class VtxDeviceStatusSmartAudio extends VtxDeviceStatus {
     }
 }
 
-vtxDeviceStatusFactory.registerVtxDeviceStatusClass(VtxDeviceStatusSmartAudio);
-
 export default VtxDeviceStatusSmartAudio;
diff --git a/src/js/utils/VtxDeviceStatus/TrampDeviceStatus.js b/src/js/utils/VtxDeviceStatus/TrampDeviceStatus.js
index 6de2a893ca..48f2854cf8 100644
--- a/src/js/utils/VtxDeviceStatus/TrampDeviceStatus.js
+++ b/src/js/utils/VtxDeviceStatus/TrampDeviceStatus.js
@@ -1,5 +1,4 @@
 import VtxDeviceStatus, { VtxDeviceTypes } from './VtxDeviceStatus';
-import vtxDeviceStatusFactory from './VtxDeviceStatusFactory';
 
 class VtxDeviceStatusTramp extends VtxDeviceStatus {
     constructor(dataView)
@@ -17,6 +16,4 @@ class VtxDeviceStatusTramp extends VtxDeviceStatus {
     }
 }
 
-vtxDeviceStatusFactory.registerVtxDeviceStatusClass(VtxDeviceStatusTramp);
-
 export default VtxDeviceStatusTramp;
diff --git a/src/js/utils/VtxDeviceStatus/VtxDeviceStatusFactory.js b/src/js/utils/VtxDeviceStatus/VtxDeviceStatusFactory.js
index 30aaacba68..884afd8255 100644
--- a/src/js/utils/VtxDeviceStatus/VtxDeviceStatusFactory.js
+++ b/src/js/utils/VtxDeviceStatus/VtxDeviceStatusFactory.js
@@ -1,4 +1,8 @@
 import VtxDeviceStatus from './VtxDeviceStatus';
+import VtxDeviceStatusSmartAudio from './SmartAudioDeviceStatus';
+import VtxDeviceStatusTramp from './TrampDeviceStatus';
+import VtxDeviceStatusMsp from './VtxMspDeviceStatus';
+import VtxDeviceStatusRtc6705 from './Rtc6705DeviceStatus';
 
 const vtxDeviceStatusFactory = {
     _vtxDeviceStatusClasses: [],
@@ -39,4 +43,9 @@ const vtxDeviceStatusFactory = {
     },
 };
 
+vtxDeviceStatusFactory.registerVtxDeviceStatusClass(VtxDeviceStatusSmartAudio);
+vtxDeviceStatusFactory.registerVtxDeviceStatusClass(VtxDeviceStatusTramp);
+vtxDeviceStatusFactory.registerVtxDeviceStatusClass(VtxDeviceStatusMsp);
+vtxDeviceStatusFactory.registerVtxDeviceStatusClass(VtxDeviceStatusRtc6705);
+
 export default vtxDeviceStatusFactory;
diff --git a/src/js/utils/VtxDeviceStatus/VtxMspDeviceStatus.js b/src/js/utils/VtxDeviceStatus/VtxMspDeviceStatus.js
index 7cf6b0f791..0dec8e6551 100644
--- a/src/js/utils/VtxDeviceStatus/VtxMspDeviceStatus.js
+++ b/src/js/utils/VtxDeviceStatus/VtxMspDeviceStatus.js
@@ -1,4 +1,3 @@
-import vtxDeviceStatusFactory from './VtxDeviceStatusFactory';
 import VtxDeviceStatus, { VtxDeviceTypes } from './VtxDeviceStatus';
 
 class VtxDeviceStatusMsp extends VtxDeviceStatus {
@@ -17,6 +16,4 @@ class VtxDeviceStatusMsp extends VtxDeviceStatus {
     }
 }
 
-vtxDeviceStatusFactory.registerVtxDeviceStatusClass(VtxDeviceStatusMsp);
-
 export default VtxDeviceStatusMsp;