diff --git a/src/gui/Pages/Chat/Timeline/EventList.qml b/src/gui/Pages/Chat/Timeline/EventList.qml
index 4e7cfc1f..6ba16dab 100644
--- a/src/gui/Pages/Chat/Timeline/EventList.qml
+++ b/src/gui/Pages/Chat/Timeline/EventList.qml
@@ -117,6 +117,11 @@ Rectangle {
 
             if (! event) return
 
+            if (event.id === chat.replyToEventId) {
+                chat.clearReplyTo()
+                return
+            }
+
             chat.replyToEventId     = event.id
             chat.replyToUserId      = event.sender_id
             chat.replyToDisplayName = event.sender_name