diff --git a/radio/src/storage/conversions/conversions_218_219.cpp b/radio/src/storage/conversions/conversions_218_219.cpp
index 7376ee0cc..528938038 100644
--- a/radio/src/storage/conversions/conversions_218_219.cpp
+++ b/radio/src/storage/conversions/conversions_218_219.cpp
@@ -303,6 +303,7 @@ void convertRadioData_218_to_219(RadioData & settings)
 #endif
 
 #if defined(RADIO_T12)
+  g_eeGeneral.switchConfig = bfSet<uint32_t>(g_eeGeneral.switchConfig, SWITCH_2POS, 10, 2);  // T12 comes with wrongly defined pot2
   g_eeGeneral.potsConfig = bfSet<uint32_t>(g_eeGeneral.potsConfig, POT_WITHOUT_DETENT, 2, 2);  // T12 comes with wrongly defined pot2
 #endif
 }
diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h
index 95e9015f6..a4d98ec2c 100644
--- a/radio/src/targets/taranis/hal.h
+++ b/radio/src/targets/taranis/hal.h
@@ -426,12 +426,7 @@
   #define SWITCHES_GPIO_PIN_G_L         GPIO_Pin_4  // PF.04
 #elif defined(RADIO_X7) || defined(PCBXLITE) || defined(PCBX9LITE)
   // no SWG
-#elif defined(RADIO_T12)
-  #define STORAGE_SWITCH_G
-  #define HARDWARE_SWITCH_G
-  #define SWITCHES_GPIO_REG_G           GPIOE->IDR
-  #define SWITCHES_GPIO_PIN_G           GPIO_Pin_14 // PE.14
-#else
+#elif !defined(RADIO_T12)
   #define STORAGE_SWITCH_G
   #define HARDWARE_SWITCH_G
   #define SWITCHES_GPIO_REG_G_H         GPIOE->IDR