diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index ee685807f80980db75658e04539da64e66d34b3d..49b92c3cac3fce2380f142b53a8aa330fb4d24c0 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1568,7 +1568,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
             }
         };
         if (account.httpUploadAvailable() || attachmentChoice == ATTACHMENT_CHOICE_LOCATION) {
-            conversation.setNextCounterpart(null);
             callback.onPresenceSelected();
         } else {
             activity.selectPresence(conversation, callback);