diff --git a/src/helpers/CommonCLI.h b/src/helpers/CommonCLI.h
index 2a9ec43bcb..3143acd2b1 100644
--- a/src/helpers/CommonCLI.h
+++ b/src/helpers/CommonCLI.h
@@ -79,7 +79,8 @@ class NodePrefs : public ConfigSerializer {
       def("bw", _parent->bw);
       def("sf", _parent->sf);
       def("cr", _parent->cr);
-      def("cad", _parent->cad_enabled);
+      static const char radio_cad_key[] = {'c', 'a', 'd', '\0'}; // workaround for T096, don't touch without testing T096 repeater still transmit
+      def(radio_cad_key, _parent->cad_enabled);
       def("int_thr", _parent->interference_threshold);
       def("rxgain", _parent->rx_boosted_gain);
       def("fem_rxgain", _parent->rx_boosted_gain);
diff --git a/variants/heltec_t096/LoRaFEMControl.cpp b/variants/heltec_t096/LoRaFEMControl.cpp
index fb60a8f781..45bbfd649c 100644
--- a/variants/heltec_t096/LoRaFEMControl.cpp
+++ b/variants/heltec_t096/LoRaFEMControl.cpp
@@ -21,6 +21,7 @@ void LoRaFEMControl::setSleepModeEnable(void)
 
 void LoRaFEMControl::setTxModeEnable(void)
 {
+    pinMode(P_LORA_KCT8103L_PA_CTX, OUTPUT);    // force pinMode before transmit as temporary workaround for https://github.com/meshcore-dev/MeshCore/issues/3151
     digitalWrite(P_LORA_KCT8103L_PA_CSD, HIGH);
     digitalWrite(P_LORA_KCT8103L_PA_CTX, HIGH);
 }