diff --git a/packages/SystemUI/src/com/android/systemui/communal/CommunalSourceMonitor.java b/packages/SystemUI/src/com/android/systemui/communal/CommunalSourceMonitor.java
index 032cd1e347ba4..2244532cca946 100644
--- a/packages/SystemUI/src/com/android/systemui/communal/CommunalSourceMonitor.java
+++ b/packages/SystemUI/src/com/android/systemui/communal/CommunalSourceMonitor.java
@@ -75,7 +75,7 @@ public class CommunalSourceMonitor {
         mSecureSettings.registerContentObserverForUser(
                 Settings.Secure.COMMUNAL_MODE_ENABLED,
                 /* notifyForDescendants= */false,
-                settingsObserver, UserHandle.USER_ALL);
+                settingsObserver, UserHandle.USER_SYSTEM);
         reloadSettings();
     }
 
@@ -141,8 +141,10 @@ public class CommunalSourceMonitor {
     }
 
     private void reloadSettings() {
-        boolean newCommunalEnabled = mSecureSettings.getInt(Settings.Secure.COMMUNAL_MODE_ENABLED,
-                1) == 1;
+        boolean newCommunalEnabled = mSecureSettings.getIntForUser(
+                Settings.Secure.COMMUNAL_MODE_ENABLED,
+                1,
+                UserHandle.USER_SYSTEM) == 1;
 
         if (DEBUG) {
             Log.d(TAG, "communal mode settings reloaded with value:" + newCommunalEnabled);
diff --git a/packages/SystemUI/tests/src/com/android/systemui/communal/CommunalSourceMonitorTest.java b/packages/SystemUI/tests/src/com/android/systemui/communal/CommunalSourceMonitorTest.java
index eb34cbb78a68f..68600de81085c 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/communal/CommunalSourceMonitorTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/communal/CommunalSourceMonitorTest.java
@@ -25,6 +25,7 @@ import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
 import android.os.Handler;
+import android.os.UserHandle;
 import android.provider.Settings;
 import android.testing.AndroidTestingRunner;
 import android.testing.TestableLooper;
@@ -137,7 +138,10 @@ public class CommunalSourceMonitorTest extends SysuiTestCase {
     }
 
     private void setCommunalEnabled(boolean enabled) {
-        mSecureSettings.putInt(Settings.Secure.COMMUNAL_MODE_ENABLED, enabled ? 1 : 0);
+        mSecureSettings.putIntForUser(
+                Settings.Secure.COMMUNAL_MODE_ENABLED,
+                enabled ? 1 : 0,
+                UserHandle.USER_SYSTEM);
         TestableLooper.get(this).processAllMessages();
     }