diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
index 6c61f3027..937406d24 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
@@ -529,6 +529,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
     protected void onNewIntent(final Intent intent) {
         if (isViewOrShareIntent(intent)) {
             if (xmppConnectionService != null) {
+                clearPendingViewIntent();
                 processViewIntent(intent);
             } else {
                 pendingViewIntent.push(intent);