diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/SaveMottoEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/SaveMottoEvent.java
index d3b2a329..50d0f9a1 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/users/SaveMottoEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/users/SaveMottoEvent.java
@@ -13,9 +13,11 @@ public class SaveMottoEvent extends MessageHandler {
         UserSavedMottoEvent event = new UserSavedMottoEvent(this.client.getHabbo(), this.client.getHabbo().getHabboInfo().getMotto(), motto);
         Emulator.getPluginManager().fireEvent(event);
         motto = event.newMotto;
-
-        this.client.getHabbo().getHabboInfo().setMotto(motto);
-        this.client.getHabbo().getHabboInfo().run();
+        
+        if(motto.length() <= Emulator.getConfig().getInt("motto.max_length", 38)) {
+            this.client.getHabbo().getHabboInfo().setMotto(motto);
+            this.client.getHabbo().getHabboInfo().run();
+        }
 
         if (this.client.getHabbo().getHabboInfo().getCurrentRoom() != null) {
             this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RoomUserDataComposer(this.client.getHabbo()).compose());