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 14190d86cea5d..e2b6895e7039a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
@@ -671,6 +671,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");