diff --git a/src/status_im/chat/screen.cljs b/src/status_im/chat/screen.cljs
index e2352d94db..29ac8782fb 100644
--- a/src/status_im/chat/screen.cljs
+++ b/src/status_im/chat/screen.cljs
@@ -77,9 +77,10 @@
   (letsubs [messages           [:get-current-chat-messages]
             current-public-key [:get-current-public-key]]
     [list/flat-list {:data                      messages
-                     :render-fn                 #(message-row {:group-chat         group-chat
-                                                               :current-public-key current-public-key
-                                                               :row                %1})
+                     :render-fn                 (fn [{:keys [message-id] :as message}]
+                                                  ^{:key message-id} [message-row {:group-chat         group-chat
+                                                                                   :current-public-key current-public-key
+                                                                                   :row                message}])
                      :inverted                  true
                      :onEndReached              #(re-frame/dispatch [:load-more-messages])
                      :enableEmptySections       true