diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 75efa1f3a6147110d951c9d71a591bcc5b0282ed..7fae1b9b4ba9608dd12786048e2080012f3f95d4 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -659,6 +659,8 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
                         message.getEncryption() != Message.ENCRYPTION_PGP &&
                         message.getEncryption() != Message.ENCRYPTION_DECRYPTION_FAILED &&
                         this.getType() == message.getType() &&
+                        this.isReactionsEmpty() &&
+                        message.isReactionsEmpty() &&
                         isStatusMergeable(this.getStatus(), message.getStatus()) &&
                         isEncryptionMergeable(this.getEncryption(),message.getEncryption()) &&
                         this.getCounterpart() != null &&
@@ -737,6 +739,10 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
         return this.reactions;
     }
 
+    public boolean isReactionsEmpty() {
+        return this.reactions.isEmpty();
+    }
+
     public Reaction.Aggregated getAggregatedReactions() {
         return Reaction.aggregated(this.reactions);
     }