diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildChangeNameDescEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildChangeNameDescEvent.java
index 7942b2cd..f25a3484 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildChangeNameDescEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildChangeNameDescEvent.java
@@ -5,6 +5,7 @@ import com.eu.habbo.habbohotel.guilds.Guild;
 import com.eu.habbo.habbohotel.permissions.Permission;
 import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.messages.incoming.MessageHandler;
+import com.eu.habbo.messages.outgoing.guilds.GuildEditFailComposer;
 import com.eu.habbo.plugin.events.guilds.GuildChangedNameEvent;
 
 public class GuildChangeNameDescEvent extends MessageHandler {
@@ -19,6 +20,15 @@ public class GuildChangeNameDescEvent extends MessageHandler {
                 GuildChangedNameEvent nameEvent = new GuildChangedNameEvent(guild, this.packet.readString(), this.packet.readString());
                 Emulator.getPluginManager().fireEvent(nameEvent);
 
+                if(nameEvent.name.length() > 29){
+                    this.client.sendResponse(new GuildEditFailComposer(GuildEditFailComposer.INVALID_GUILD_NAME));
+                    return;
+                }
+
+                if(nameEvent.description.length() > 254){
+                    return;
+                }
+
                 if (nameEvent.isCancelled())
                     return;