diff --git a/src/main/cms/cms.c b/src/main/cms/cms.c
index b1208d474..a3080cc5e 100644
--- a/src/main/cms/cms.c
+++ b/src/main/cms/cms.c
@@ -71,7 +71,7 @@
 #define CMS_MAX_DEVICE 4
 #endif
 
-static displayPort_t *pCurrentDisplay;
+displayPort_t *pCurrentDisplay;
 
 static displayPort_t *cmsDisplayPorts[CMS_MAX_DEVICE];
 static int cmsDeviceCount;
diff --git a/src/main/cms/cms.h b/src/main/cms/cms.h
index bf952a4cb..6efd68991 100644
--- a/src/main/cms/cms.h
+++ b/src/main/cms/cms.h
@@ -8,6 +8,7 @@ extern bool cmsInMenu;
 
 // Device management
 bool cmsDisplayPortRegister(displayPort_t *pDisplay);
+displayPort_t *pCurrentDisplay;
 
 // For main.c and scheduler
 void cmsInit(void);
diff --git a/src/main/io/displayport_srxl.c b/src/main/io/displayport_srxl.c
index acfdcda61..0299c8163 100644
--- a/src/main/io/displayport_srxl.c
+++ b/src/main/io/displayport_srxl.c
@@ -29,7 +29,7 @@
 
 #include "telemetry/srxl.h"
 
-static displayPort_t srxlDisplayPort;
+displayPort_t srxlDisplayPort;
 
 static int srxlDrawScreen(displayPort_t *displayPort)
 {
diff --git a/src/main/io/displayport_srxl.h b/src/main/io/displayport_srxl.h
index 72019e0f1..638cb31a3 100644
--- a/src/main/io/displayport_srxl.h
+++ b/src/main/io/displayport_srxl.h
@@ -18,3 +18,4 @@
 #pragma once
 
 displayPort_t *displayPortSrxlInit();
+displayPort_t srxlDisplayPort;
diff --git a/src/main/telemetry/srxl.c b/src/main/telemetry/srxl.c
index 5970436e8..e230b9394 100644
--- a/src/main/telemetry/srxl.c
+++ b/src/main/telemetry/srxl.c
@@ -26,6 +26,7 @@
 #include "build/version.h"
 
 #include "cms/cms.h"
+#include "io/displayport_srxl.h"
 
 #include "common/crc.h"
 #include "common/streambuf.h"
@@ -234,7 +235,7 @@ static bool lineSent[SPEKTRUM_SRXL_DEVICE_TEXTGEN_ROWS];
 int spektrumTmTextGenPutChar(uint8_t col, uint8_t row, char c)
 {
     if (row < SPEKTRUM_SRXL_TEXTGEN_BUFFER_ROWS && col < SPEKTRUM_SRXL_TEXTGEN_BUFFER_COLS) {
-        // Only update and force a tm transmision if something has actually changed.
+      // Only update and force a tm transmision if something has actually changed.
         if (srxlTextBuff[row][col] != c) {
           srxlTextBuff[row][col] = c;
           lineSent[row] = false;
@@ -472,8 +473,9 @@ static void processSrxl(timeUs_t currentTimeUs)
 #if defined (USE_SPEKTRUM_CMS_TELEMETRY) && defined (USE_CMS)
         // Boost CMS performance by sending nothing else but CMS Text frames when in a CMS menu.
         // Sideeffect, all other reports are still not sent if user leaves CMS without a proper EXIT.
-        if (cmsInMenu) {
-          srxlFnPtr = srxlFrameText;
+        if (cmsInMenu &&
+            (pCurrentDisplay == &srxlDisplayPort)) {
+            srxlFnPtr = srxlFrameText;
         }
 #endif