diff --git a/app/src/main/java/com/example/medilightv2android/ble/BleManager.kt b/app/src/main/java/com/example/medilightv2android/ble/BleManager.kt
index 571595f..dcb5837 100644
--- a/app/src/main/java/com/example/medilightv2android/ble/BleManager.kt
+++ b/app/src/main/java/com/example/medilightv2android/ble/BleManager.kt
@@ -287,6 +287,10 @@ class BleManager private constructor(private val context: Context) {
         sendRaw(CRC16.buildCommand("mta", intArrayOf(1)))
     }
 
+    fun sendNirsPowerOff() {
+        sendRaw(CRC16.buildCommand("mta", intArrayOf(0)))
+    }
+
     fun sendMqqQuery() {
         sendRaw(CRC16.buildCommand("mqq"))
     }
diff --git a/app/src/main/java/com/example/medilightv2android/ui/views/monitoring/VivamyoMonitoringView.kt b/app/src/main/java/com/example/medilightv2android/ui/views/monitoring/VivamyoMonitoringView.kt
index 48efa69..bfd8d08 100644
--- a/app/src/main/java/com/example/medilightv2android/ui/views/monitoring/VivamyoMonitoringView.kt
+++ b/app/src/main/java/com/example/medilightv2android/ui/views/monitoring/VivamyoMonitoringView.kt
@@ -108,19 +108,29 @@ fun VivamyoMonitoringView(appState: AppState) {
         handler.postDelayed(initialRetry, 2000)
     }
 
+    fun stopNirsStream() {
+        // 1. Stop polling chain & clear callback first
+        nirsManager.stopStreaming()
+        cancelMcjRetry()
+        bleManager.onNirsMcjReceived = null
+
+        // 2. Resume battery polling after in-flight mcj response has time to arrive
+        handler.postDelayed({
+            bleManager.startBatteryPolling()
+        }, 500)
+    }
+
     fun toggleStreaming() {
         if (isToggling) return
         isToggling = true
         if (isStreaming) {
-            nirsManager.stopStreaming()
-            cancelMcjRetry()
-            bleManager.startBatteryPolling() // Resume battery polling
+            stopNirsStream()
         } else {
             bleManager.stopBatteryPolling() // Pause battery polling during streaming
             nirsManager.startStreaming()
             startNirsStream()
         }
-        handler.postDelayed({ isToggling = false }, 500)
+        handler.postDelayed({ isToggling = false }, 1000)
     }
 
     LaunchedEffect(Unit) {
@@ -130,7 +140,10 @@ fun VivamyoMonitoringView(appState: AppState) {
         }
     }
 
-    DisposableEffect(Unit) { onDispose { nirsManager.stopStreaming(); cancelMcjRetry() } }
+    DisposableEffect(Unit) { onDispose {
+        if (nirsManager.isStreaming.value) stopNirsStream()
+        else { cancelMcjRetry(); bleManager.onNirsMcjReceived = null }
+    } }
 
     // Clear confirm dialog
     if (showClearConfirm) {