diff --git a/sponge/src/main/java/me/lucko/luckperms/users/SpongeUserManager.java b/sponge/src/main/java/me/lucko/luckperms/users/SpongeUserManager.java
index 7c3fab72..8b425e74 100644
--- a/sponge/src/main/java/me/lucko/luckperms/users/SpongeUserManager.java
+++ b/sponge/src/main/java/me/lucko/luckperms/users/SpongeUserManager.java
@@ -41,10 +41,14 @@ public class SpongeUserManager extends UserManager implements ContextListener<Pl
     public void cleanup(User user) {
         if (!plugin.getGame().getServer().getPlayer(plugin.getUuidCache().getExternalUUID(user.getUuid())).isPresent()) {
             unload(user);
-            plugin.getService().getUserSubjects().unload(user.getUuid());
         }
     }
 
+    @Override
+    public void preUnload(User user) {
+        plugin.getService().getUserSubjects().unload(user.getUuid());
+    }
+
     @Override
     public User apply(UserIdentifier id) {
         SpongeUser user = id.getUsername() == null ?