diff --git a/src/main/rx/jetiexbus.c b/src/main/rx/jetiexbus.c
index c3855042ca..58dcde04b3 100644
--- a/src/main/rx/jetiexbus.c
+++ b/src/main/rx/jetiexbus.c
@@ -129,7 +129,6 @@ void jetiExBusDecodeChannelFrame(uint8_t *exBusFrame)
 
     case EXBUS_CHANNELDATA_DATA_REQUEST:                   // not yet specified
     case EXBUS_CHANNELDATA:
-        DEBUG_SET(DEBUG_EXBUS, 0, receivedChannelCount);
         for (uint8_t i = 0; i < receivedChannelCount; i++) {
             frameAddr = EXBUS_HEADER_LEN + (i * 2);
             value = ((uint16_t)exBusFrame[frameAddr + 1]) << 8;
@@ -174,7 +173,6 @@ static void jetiExBusDataReceive(uint16_t c, void *data)
     // Check if we shall reset frame position due to time
     if (cmpTimeUs(now, jetiExBusTimeLast) > JETIEXBUS_MIN_FRAME_GAP) {
         jetiExBusFrameReset();
-        DEBUG_SET(DEBUG_EXBUS, 1, resetTimeCount++);
         jetiExBusFrameState = EXBUS_STATE_ZERO;
         jetiExBusRequestState = EXBUS_STATE_ZERO;
     }
@@ -211,7 +209,6 @@ static void jetiExBusDataReceive(uint16_t c, void *data)
     if (jetiExBusFramePosition == jetiExBusFrameMaxSize) {
         // frame overrun
         jetiExBusFrameReset();
-        DEBUG_SET(DEBUG_EXBUS, 2, resetOverrunCount++);
         jetiExBusFrameState = EXBUS_STATE_ZERO;
         jetiExBusRequestState = EXBUS_STATE_ZERO;
 
@@ -224,23 +221,17 @@ static void jetiExBusDataReceive(uint16_t c, void *data)
 
     // Check the header for the message length
     if (jetiExBusFramePosition == EXBUS_HEADER_LEN) {
-        DEBUG_SET(DEBUG_EXBUS, 4, 0);
-        DEBUG_SET(DEBUG_EXBUS, 5, 0);
-
         if ((jetiExBusFrameState == EXBUS_STATE_IN_PROGRESS) && (jetiExBusFrame[EXBUS_HEADER_MSG_LEN] <= EXBUS_MAX_CHANNEL_FRAME_SIZE)) {
             jetiExBusFrameLength = jetiExBusFrame[EXBUS_HEADER_MSG_LEN];
-            DEBUG_SET(DEBUG_EXBUS, 4, 1);
             return;
         }
 
         if ((jetiExBusRequestState == EXBUS_STATE_IN_PROGRESS) && (jetiExBusFrame[EXBUS_HEADER_MSG_LEN] <= EXBUS_MAX_REQUEST_FRAME_SIZE)) {
             jetiExBusFrameLength = jetiExBusFrame[EXBUS_HEADER_MSG_LEN];
-            DEBUG_SET(DEBUG_EXBUS, 5, 1);
             return;
         }
 
         jetiExBusFrameReset();                  // not a valid frame
-        DEBUG_SET(DEBUG_EXBUS, 3, resetInvalidCount++);
         jetiExBusFrameState = EXBUS_STATE_ZERO;
         jetiExBusRequestState = EXBUS_STATE_ZERO;
         return;
@@ -256,7 +247,6 @@ static void jetiExBusDataReceive(uint16_t c, void *data)
             jetiExBusFrameState = EXBUS_STATE_ZERO;
             jetiExBusRequestState = EXBUS_STATE_RECEIVED;
             jetiTimeStampRequest = now;
-            DEBUG_SET(DEBUG_EXBUS, 7, now);
         }
 
         jetiExBusFrameReset();
diff --git a/src/main/telemetry/jetiexbus.c b/src/main/telemetry/jetiexbus.c
index bcc1ac9c51..56365bbbdb 100644
--- a/src/main/telemetry/jetiexbus.c
+++ b/src/main/telemetry/jetiexbus.c
@@ -146,14 +146,14 @@ const exBusSensor_t jetiExSensors[] = {
     {"G-Force Z",       "",         EX_TYPE_22b,   DECIMAL_MASK(3)},
     {"RPM",             "",         EX_TYPE_22b,   DECIMAL_MASK(0)},
     {"Trip Distance",   "m",        EX_TYPE_22b,   DECIMAL_MASK(1)},
-    {"Channel Count",   "",         EX_TYPE_22b,   DECIMAL_MASK(0)},
-    {"Timeouts",        "",         EX_TYPE_22b,   DECIMAL_MASK(0)},
-    {"Overruns",        "",         EX_TYPE_22b,   DECIMAL_MASK(0)},
-    {"Invalid frames",  "",         EX_TYPE_22b,   DECIMAL_MASK(0)},
-    {"Frame done",      "",         EX_TYPE_22b,   DECIMAL_MASK(0)},
-    {"Request done",    "",         EX_TYPE_22b,   DECIMAL_MASK(0)},
-    {"Tel frame lost",  "",         EX_TYPE_22b,   DECIMAL_MASK(0)},
-    {"Request Timeout", "",         EX_TYPE_22b,   DECIMAL_MASK(0)}
+    {"DEBUG0",          "",         EX_TYPE_22b,   DECIMAL_MASK(0)},
+    {"DEBUG1",          "",         EX_TYPE_22b,   DECIMAL_MASK(0)},
+    {"DEBUG2",          "",         EX_TYPE_22b,   DECIMAL_MASK(0)},
+    {"DEBUG3",          "",         EX_TYPE_22b,   DECIMAL_MASK(0)},
+    {"DEBUG4",          "",         EX_TYPE_22b,   DECIMAL_MASK(0)},
+    {"DEBUG5",          "",         EX_TYPE_22b,   DECIMAL_MASK(0)},
+    {"DEBUG6",          "",         EX_TYPE_22b,   DECIMAL_MASK(0)},
+    {"DEBUG7",          "",         EX_TYPE_22b,   DECIMAL_MASK(0)}
 };
 
 // after every 15 sensors increment the step by 2 (e.g. ...EX_VAL15, EX_VAL16 = 17) to skip the device description
@@ -298,14 +298,16 @@ void initJetiExBusTelemetry(void)
     }
 #endif
 
-    bitArraySet(&exSensorEnabled, EX_DEBUG0);
-    bitArraySet(&exSensorEnabled, EX_DEBUG1);
-    bitArraySet(&exSensorEnabled, EX_DEBUG2);
-    bitArraySet(&exSensorEnabled, EX_DEBUG3);
-    bitArraySet(&exSensorEnabled, EX_DEBUG4);
-    bitArraySet(&exSensorEnabled, EX_DEBUG5);
-    bitArraySet(&exSensorEnabled, EX_DEBUG6);
-    bitArraySet(&exSensorEnabled, EX_DEBUG7);
+    if (debugMode != DEBUG_NONE) {
+        bitArraySet(&exSensorEnabled, EX_DEBUG0);
+        bitArraySet(&exSensorEnabled, EX_DEBUG1);
+        bitArraySet(&exSensorEnabled, EX_DEBUG2);
+        bitArraySet(&exSensorEnabled, EX_DEBUG3);
+        bitArraySet(&exSensorEnabled, EX_DEBUG4);
+        bitArraySet(&exSensorEnabled, EX_DEBUG5);
+        bitArraySet(&exSensorEnabled, EX_DEBUG6);
+        bitArraySet(&exSensorEnabled, EX_DEBUG7);
+    }
 
     //for(int i = 16; i < 32; ++i) {
     //    bitArrayClr(&exSensorEnabled, i);
@@ -567,7 +569,6 @@ void handleJetiExBusTelemetry(void)
         if (timeDiff > 3000) {   // include reserved time
             jetiExBusRequestState = EXBUS_STATE_ZERO;
             framesLost++;
-            //DEBUG_SET(DEBUG_EXBUS, 6, framesLost);
             return;
         }