diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
index 85dcd1321611f..ca55e64b75818 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
@@ -679,6 +679,7 @@ public class UserSwitcherController implements Dumpable {
                     scheduleGuestCreation();
                 }
                 switchToUserId(targetUserId);
+                mUserManager.removeUser(currentUser.id);
             }
         } catch (RemoteException e) {
             Log.e(TAG, "Couldn't remove guest because ActivityManager or WindowManager is dead");