diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserDemote.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserDemote.java
index d11cdb1b4..eb97458d8 100644
--- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserDemote.java
+++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserDemote.java
@@ -65,9 +65,11 @@ public class UserDemote extends UserSubCommand {
 
                         try {
                             user.unsetPermission("group." + old);
+                        } catch (ObjectLacksException ignored) {}
+                        try {
                             user.addGroup(previousGroup);
-                            user.setPrimaryGroup(previousGroup.getName());
-                        } catch (ObjectLacksException | ObjectAlreadyHasException ignored) {}
+                        } catch (ObjectAlreadyHasException ignored) {}
+                        user.setPrimaryGroup(previousGroup.getName());
 
                         Message.USER_DEMOTE_SUCCESS_PROMOTE.send(sender, track.getName(), old, previousGroup.getName());
                         Message.USER_DEMOTE_SUCCESS_REMOVE.send(sender, user.getName(), old, previousGroup.getName(), previousGroup.getName());
diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserPromote.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserPromote.java
index 56f3a9bee..b8319cb91 100644
--- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserPromote.java
+++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserPromote.java
@@ -65,9 +65,11 @@ public class UserPromote extends UserSubCommand {
 
                         try {
                             user.unsetPermission("group." + old);
+                        } catch (ObjectLacksException ignored) {}
+                        try {
                             user.addGroup(nextGroup);
-                            user.setPrimaryGroup(nextGroup.getName());
-                        } catch (ObjectLacksException | ObjectAlreadyHasException ignored) {}
+                        } catch (ObjectAlreadyHasException ignored) {}
+                        user.setPrimaryGroup(nextGroup.getName());
 
                         Message.USER_PROMOTE_SUCCESS_PROMOTE.send(sender, track.getName(), old, nextGroup.getName());
                         Message.USER_PROMOTE_SUCCESS_REMOVE.send(sender, user.getName(), old, nextGroup.getName(), nextGroup.getName());