diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgMetaData.java b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgMetaData.java
index 8f23a917a2..2376a7a35f 100644
--- a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgMetaData.java
+++ b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgMetaData.java
@@ -29,7 +29,7 @@ import java.util.concurrent.ConcurrentHashMap;
 @Data
 public final class TbMsgMetaData implements Serializable {
 
-    public static final TbMsgMetaData EMPTY = new TbMsgMetaData(Collections.emptyMap());
+    public static final TbMsgMetaData EMPTY = new TbMsgMetaData(0);
 
     private final Map<String, String> data;
 
@@ -41,6 +41,13 @@ public final class TbMsgMetaData implements Serializable {
         this.data = new ConcurrentHashMap<>(data);
     }
 
+    /**
+     * Internal constructor to create immutable TbMsgMetaData.EMPTY
+     * */
+    private TbMsgMetaData(int ignored) {
+        this.data = Collections.emptyMap();
+    }
+
     public String getValue(String key) {
         return data.get(key);
     }