diff --git a/src/main/java/com/eu/habbo/messages/outgoing/MessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/MessageComposer.java
index 531abd0b..4a9c721e 100644
--- a/src/main/java/com/eu/habbo/messages/outgoing/MessageComposer.java
+++ b/src/main/java/com/eu/habbo/messages/outgoing/MessageComposer.java
@@ -17,7 +17,11 @@ public abstract class MessageComposer {
     public ServerMessage compose() {
         if (this.composed == null) {
             this.composed = this.composeInternal();
-            this.composed.setComposer(this);
+            if(this.composed != null) {
+                if(this.composed.getComposer() == null) {
+                    this.composed.setComposer(this);
+                }
+            }
         }
 
         return this.composed;