diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java
index 38555728..d8748aca 100644
--- a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java
+++ b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java
@@ -3065,7 +3065,11 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
 
         Rectangle show = this.roomSpecialTypes.tentAt(habbo.getRoomUnit().getCurrentLocation());
 
-        roomChatMessage.setMessage(roomChatMessage.getMessage().trim());
+        String trimmedMessage = roomChatMessage.getMessage().replaceAll("\\s+$","");
+
+        if (trimmedMessage.isEmpty()) trimmedMessage = " ";
+
+        roomChatMessage.setMessage(trimmedMessage);
 
         if (chatType == RoomChatType.WHISPER) {
             if (roomChatMessage.getTargetHabbo() == null) {