diff --git a/app/src/main/java/chat/revolt/components/chat/Message.kt b/app/src/main/java/chat/revolt/components/chat/Message.kt
index eacdd149..9fef9ac2 100644
--- a/app/src/main/java/chat/revolt/components/chat/Message.kt
+++ b/app/src/main/java/chat/revolt/components/chat/Message.kt
@@ -180,7 +180,9 @@ fun Message(
                     .combinedClickable(
                         onClick = {},
                         onDoubleClick = {
-                            onReply()
+                            if (canReply) {
+                                onReply()
+                            }
                         },
                         onLongClick = {
                             onMessageContextMenu()
diff --git a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenViewModel.kt b/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenViewModel.kt
index 042efa12..92a0cc62 100644
--- a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenViewModel.kt
+++ b/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenViewModel.kt
@@ -101,6 +101,7 @@ class ChannelScreenViewModel : ViewModel() {
         get() = _replies
 
     fun addInReplyTo(reply: SendMessageReply) {
+        if (_replies.any { it.id == reply.id }) return
         _replies.add(reply)
     }