diff --git a/src/status_im/group_chats/core.cljs b/src/status_im/group_chats/core.cljs
index a37d180553..0403a85a33 100644
--- a/src/status_im/group_chats/core.cljs
+++ b/src/status_im/group_chats/core.cljs
@@ -115,11 +115,9 @@
                                 :dsts          members
                                 :success-event [:transport/message-sent
                                                 chat-id
-                                                (transport.utils/message-id
-                                                 ;; NOTE: There is no clock-value here.
-                                                 ;; Will we have collision?
-                                                 {:from current-public-key
-                                                  :chat-id chat-id})
+                                                (transport.utils/message-id (assoc (:message payload)
+                                                                                   :chat-id chat-id
+                                                                                   :from current-public-key))
                                                 :group-user-message]
                                 :payload       payload}}))))