diff --git a/src/trx-client/trx-frontend/trx-frontend-http/assets/web/app.js b/src/trx-client/trx-frontend/trx-frontend-http/assets/web/app.js
index 16d2667..4fe8ac5 100644
--- a/src/trx-client/trx-frontend/trx-frontend-http/assets/web/app.js
+++ b/src/trx-client/trx-frontend/trx-frontend-http/assets/web/app.js
@@ -1444,6 +1444,9 @@ function render(update) {
     modeEl.value = modeUpper;
     if (modeUpper === "WFM" && lastModeName !== "WFM") {
       setJogDivisor(10);
+      resetRdsDisplay();
+    } else if (modeUpper !== "WFM" && lastModeName === "WFM") {
+      resetRdsDisplay();
     }
     lastModeName = modeUpper;
     updateWfmControls();
@@ -3692,11 +3695,13 @@ function startSpectrumStreaming() {
     try {
       lastSpectrumData = JSON.parse(evt.data);
       lastSpectrumRenderData = buildSpectrumRenderData(lastSpectrumData);
-      rdsFrameCount++;
       pushOverviewWaterfallFrame(lastSpectrumData);
       refreshCenterFreqDisplay();
       scheduleSpectrumDraw();
-      updateRdsPsOverlay(lastSpectrumData.rds);
+      if (lastModeName === "WFM") {
+        rdsFrameCount++;
+        updateRdsPsOverlay(lastSpectrumData.rds);
+      }
     } catch (_) {}
   };
   spectrumSource.onerror = () => {