diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsethome.java b/Essentials/src/com/earth2me/essentials/commands/Commandsethome.java
index 1a9b0f377cc..89cc2bee370 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandsethome.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandsethome.java
@@ -71,10 +71,10 @@ public void run(final Server server, final User user, final String commandLabel,
     private boolean checkHomeLimit(final User user, final User usersHome, final String name) throws Exception {
         if (!user.isAuthorized("essentials.sethome.multiple.unlimited")) {
             final int limit = ess.getSettings().getHomeLimit(user);
-            if (usersHome.getHomes().size() == limit && usersHome.getHomes().contains(name)) {
-                return false;
-            }
             if (usersHome.getHomes().size() >= limit) {
+                if (usersHome.getHomes().contains(name)) {
+                    return false;
+                }
                 throw new Exception(tl("maxHomes", ess.getSettings().getHomeLimit(user)));
             }
             return limit == 1;