diff --git a/src/main/cms/cms_menu_builtin.c b/src/main/cms/cms_menu_builtin.c
index 783864ffe1..1827655268 100644
--- a/src/main/cms/cms_menu_builtin.c
+++ b/src/main/cms/cms_menu_builtin.c
@@ -97,12 +97,14 @@ static OSD_Entry menuFeaturesEntries[] =
 #if defined(VTX) || defined(USE_RTC6705)
     {"VTX", OME_Submenu, cmsMenuChange, &cmsx_menuVtx, 0},
 #endif // VTX || USE_RTC6705
+#if defined(VTX_CONTROL)
 #if defined(VTX_SMARTAUDIO)
     {"VTX SA", OME_Submenu, cmsMenuChange, &cmsx_menuVtxSmartAudio, 0},
 #endif
 #if defined(VTX_TRAMP)
     {"VTX TR", OME_Submenu, cmsMenuChange, &cmsx_menuVtxTramp, 0},
 #endif
+#endif // VTX_CONTROL
 #ifdef LED_STRIP
     {"LED STRIP", OME_Submenu, cmsMenuChange, &cmsx_menuLedstrip, 0},
 #endif // LED_STRIP
diff --git a/src/main/fc/fc_init.c b/src/main/fc/fc_init.c
index f86682bb66..cbe0fdb3ec 100644
--- a/src/main/fc/fc_init.c
+++ b/src/main/fc/fc_init.c
@@ -524,6 +524,8 @@ void init(void)
     baroSetCalibrationCycles(CALIBRATING_BARO_CYCLES);
 #endif
 
+#ifdef VTX_CONTROL
+
 #ifdef VTX_SMARTAUDIO
     smartAudioInit();
 #endif
@@ -532,6 +534,8 @@ void init(void)
     trampInit();
 #endif
 
+#endif // VTX_CONTROL
+
     // start all timers
     // TODO - not implemented yet
     timerStart();
diff --git a/src/main/io/vtx_tramp.h b/src/main/io/vtx_tramp.h
index 0d08d0d293..1864cf0a97 100644
--- a/src/main/io/vtx_tramp.h
+++ b/src/main/io/vtx_tramp.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#if defined(VTX_TRAMP) && defined(VTX_CONTROL)
+
 bool trampInit();
 void trampProcess(uint32_t currentTimeUs);
 
@@ -8,3 +10,5 @@ void trampProcess(uint32_t currentTimeUs);
 #include "cms/cms_types.h"
 extern CMS_Menu cmsx_menuVtxTramp;
 #endif
+
+#endif
diff --git a/src/main/target/common_post.h b/src/main/target/common_post.h
index 193124c071..d881516c14 100644
--- a/src/main/target/common_post.h
+++ b/src/main/target/common_post.h
@@ -22,5 +22,4 @@
 // Targets with built-in vtx do not need external vtx
 #if defined(VTX) || defined(USE_RTC6705)
 # undef VTX_CONTROL
-# undef VTX_SMARTAUDIO
 #endif