diff --git a/services/core/java/com/android/server/storage/StorageSessionController.java b/services/core/java/com/android/server/storage/StorageSessionController.java
index ff6c2f551bb38..5f5e6a3e6f462 100644
--- a/services/core/java/com/android/server/storage/StorageSessionController.java
+++ b/services/core/java/com/android/server/storage/StorageSessionController.java
@@ -147,17 +147,18 @@ public final class StorageSessionController {
             return;
         }
         String sessionId = vol.getId();
-        int userId = getConnectionUserIdForVolume(vol);
+        int connectionUserId = getConnectionUserIdForVolume(vol);
 
         StorageUserConnection connection = null;
         synchronized (mLock) {
-            connection = mConnections.get(userId);
+            connection = mConnections.get(connectionUserId);
             if (connection != null) {
                 Slog.i(TAG, "Notifying volume state changed for session with id: " + sessionId);
                 connection.notifyVolumeStateChanged(sessionId,
-                        vol.buildStorageVolume(mContext, userId, false));
+                        vol.buildStorageVolume(mContext, vol.getMountUserId(), false));
             } else {
-                Slog.w(TAG, "No available storage user connection for userId : " + userId);
+                Slog.w(TAG, "No available storage user connection for userId : "
+                        + connectionUserId);
             }
         }
     }