diff --git a/lib/views/chat.dart b/lib/views/chat.dart
index f86fb6b..9cce68f 100644
--- a/lib/views/chat.dart
+++ b/lib/views/chat.dart
@@ -677,7 +677,8 @@ class _ChatState extends State<_Chat> {
                                       index: i - 1,
                                       controller: _scrollController,
                                       child: Swipeable(
-                                        key: ValueKey(i - 1),
+                                        key: ValueKey(
+                                            filteredEvents[i - 1].eventId),
                                         background: Container(
                                           color: Theme.of(context)
                                               .primaryColor