diff --git a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlViewHolder.kt b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlViewHolder.kt
index e8530272a5c81..5dd8accbc7bd3 100644
--- a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlViewHolder.kt
+++ b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlViewHolder.kt
@@ -218,13 +218,11 @@ class ControlViewHolder(
         cancelUpdate = uiExecutor.executeDelayed({
             animateStatusChange(/* animated */ true, {
                 setStatusText(previousText, /* immediately */ true)
-                updateContentDescription()
             })
         }, UPDATE_DELAY_IN_MILLIS)
 
         animateStatusChange(/* animated */ true, {
             setStatusText(tempStatus, /* immediately */ true)
-            updateContentDescription()
         })
     }
 
@@ -296,6 +294,7 @@ class ControlViewHolder(
         if (immediately) {
             status.alpha = STATUS_ALPHA_ENABLED
             status.text = text
+            updateContentDescription()
         }
         nextStatusText = text
     }
@@ -412,6 +411,8 @@ class ControlViewHolder(
         setEnabled(enabled)
 
         status.text = text
+        updateContentDescription()
+
         status.setTextColor(color)
 
         control?.getCustomIcon()?.let {
diff --git a/packages/SystemUI/src/com/android/systemui/controls/ui/ToggleRangeBehavior.kt b/packages/SystemUI/src/com/android/systemui/controls/ui/ToggleRangeBehavior.kt
index 02f80e842516e..04881af6ed45c 100644
--- a/packages/SystemUI/src/com/android/systemui/controls/ui/ToggleRangeBehavior.kt
+++ b/packages/SystemUI/src/com/android/systemui/controls/ui/ToggleRangeBehavior.kt
@@ -163,8 +163,10 @@ class ToggleRangeBehavior : Behavior {
                     AccessibilityNodeInfo.RangeInfo.RANGE_TYPE_FLOAT
                 }
 
-                val rangeInfo = AccessibilityNodeInfo.RangeInfo.obtain(type, min, max, current)
-                info.setRangeInfo(rangeInfo)
+                if (isChecked) {
+                    val rangeInfo = AccessibilityNodeInfo.RangeInfo.obtain(type, min, max, current)
+                    info.setRangeInfo(rangeInfo)
+                }
                 info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_SET_PROGRESS)
             }