diff --git a/src/engine/net/client/handlers/AbandonAssetMsgHandler.java b/src/engine/net/client/handlers/AbandonAssetMsgHandler.java
index dd21cdcb..40716fff 100644
--- a/src/engine/net/client/handlers/AbandonAssetMsgHandler.java
+++ b/src/engine/net/client/handlers/AbandonAssetMsgHandler.java
@@ -171,12 +171,14 @@ public class AbandonAssetMsgHandler extends AbstractClientMsgHandler {
         if (sourceGuild.getOwnedCity().realm != null)
             sourceGuild.getOwnedCity().realm.abandonRealm();
 
-        if (sourceGuild.getNation().equals(sourceGuild))
+        if (sourceGuild.guildState.equals(GuildState.Sovereign))
             sourceGuild.guildState = GuildState.Errant;
         else
             sourceGuild.guildState = GuildState.Sworn;
 
         sourceGuild.setCityUUID(0);
+        GuildManager.updateAllGuildTags(sourceGuild);
+        GuildManager.updateAllGuildBinds(sourceGuild, null);
 
         // Guild no longer owns his tree.
         if (!DbManager.GuildQueries.SET_GUILD_OWNED_CITY(sourceGuild.getObjectUUID(), 0)) {