diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 90eee7026..9b4be3e0d 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -875,14 +875,14 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
     private StringBuilder removeReplyFallback(Message message, Message replyMessage) {
         StringBuilder sb = new StringBuilder(message.body);
 
+        List<Element> replyFallback = message.getFallbacks("urn:xmpp:reply:0");
+        if (replyFallback.isEmpty()) {
+            return sb;
+        }
+
         if (replyMessage != null && replyMessage.edits.isEmpty()) {
             sb.replace(0, replyMessage.body.codePointCount(0, replyMessage.body.length()) + 3, "");
         } else {
-            List<Element> replyFallback = message.getFallbacks("urn:xmpp:reply:0");
-            if (replyFallback.isEmpty()) {
-                return sb;
-            }
-
             Element bodyFallback = replyFallback.get(0).findChild("body");
             int startCodePoint = Integer.parseInt(bodyFallback.getAttribute("start"));
             int endCodePoint = Integer.parseInt(bodyFallback.getAttribute("end"));