diff --git a/src/main/platform.h b/src/main/platform.h
index 0f6439cbc..9e2c68e0d 100644
--- a/src/main/platform.h
+++ b/src/main/platform.h
@@ -73,4 +73,4 @@
 
 #include "target/common.h"
 #include "target.h"
-
+#include "target/common_post.h"
diff --git a/src/main/target/OMNIBUS/target.h b/src/main/target/OMNIBUS/target.h
index a4f5d5756..e0407debb 100644
--- a/src/main/target/OMNIBUS/target.h
+++ b/src/main/target/OMNIBUS/target.h
@@ -106,11 +106,6 @@
 //#define MAX7456_DMA_CHANNEL_RX            DMA1_Channel2
 //#define MAX7456_DMA_IRQ_HANDLER_ID        DMA1_CH3_HANDLER
 
-// VTX monitor task
-#define VTX_CONTROL
-// VTX device type
-#define VTX_SMARTAUDIO
-
 #define USE_SPI
 #define USE_SPI_DEVICE_2 // PB12,13,14,15 on AF5
 
diff --git a/src/main/target/OMNIBUSF4/target.h b/src/main/target/OMNIBUSF4/target.h
index 078998605..409854ae2 100644
--- a/src/main/target/OMNIBUSF4/target.h
+++ b/src/main/target/OMNIBUSF4/target.h
@@ -131,11 +131,6 @@
 
 #define SERIAL_PORT_COUNT       4 //VCP, USART1, USART3, USART6
 
-// VTX monitor task
-#define VTX_CONTROL
-// VTX device type
-#define VTX_SMARTAUDIO
-
 #define USE_SPI
 
 #define USE_SPI_DEVICE_1
diff --git a/src/main/target/common.h b/src/main/target/common.h
index 4f66ce3cb..66d17911a 100644
--- a/src/main/target/common.h
+++ b/src/main/target/common.h
@@ -101,6 +101,7 @@
 #define TELEMETRY_MAVLINK
 #define USE_RX_MSP
 #define USE_SERIALRX_JETIEXBUS
+#define VTX_CONTROL
 #define VTX_SMARTAUDIO
 #else
 #define SKIP_CLI_COMMAND_HELP
diff --git a/src/main/target/common_post.h b/src/main/target/common_post.h
new file mode 100644
index 000000000..193124c07
--- /dev/null
+++ b/src/main/target/common_post.h
@@ -0,0 +1,26 @@
+/*
+ * This file is part of Cleanflight.
+ *
+ * Cleanflight is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Cleanflight is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Cleanflight.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Touch up configuration
+
+#pragma once
+
+// Targets with built-in vtx do not need external vtx
+#if defined(VTX) || defined(USE_RTC6705)
+# undef VTX_CONTROL
+# undef VTX_SMARTAUDIO
+#endif