diff --git a/src/engine/net/client/handlers/SwearInGuildHandler.java b/src/engine/net/client/handlers/SwearInGuildHandler.java
index 262f6cb3..07304927 100644
--- a/src/engine/net/client/handlers/SwearInGuildHandler.java
+++ b/src/engine/net/client/handlers/SwearInGuildHandler.java
@@ -100,7 +100,8 @@ public class SwearInGuildHandler extends AbstractClientMsgHandler {
             protectorate.setNation(nation);
             GuildManager.updateAllGuildTags(protectorate);
 
-            if (nation.getGuildState() == GuildState.Sovereign)
+            if (nation.getGuildState() == GuildState.Sovereign &&
+                    protectorate.getGuildState().equals(GuildState.Protectorate))
                 nation.setGuildState(GuildState.Nation);
 
             SendGuildEntryMsg msg = new SendGuildEntryMsg(player);