diff --git a/lib/src/main/java/io/ably/lib/types/BaseMessage.java b/lib/src/main/java/io/ably/lib/types/BaseMessage.java
index 44b91d7e2..10c6ba42b 100644
--- a/lib/src/main/java/io/ably/lib/types/BaseMessage.java
+++ b/lib/src/main/java/io/ably/lib/types/BaseMessage.java
@@ -171,11 +171,11 @@ public void decode(ChannelOptions opts,  DecodingContext context) throws Message
         }
 
         //last message bookkeping
-        if(lastPayload instanceof String)
+        if (lastPayload instanceof String)
             context.setLastMessageData((String)lastPayload);
         else if (lastPayload instanceof byte[])
             context.setLastMessageData((byte[])lastPayload);
-        else
+        else if (lastPayload != null)
             throw MessageDecodeException.fromDescription("Message data neither String nor byte[]. Unsupported message data type.");
     }