diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index ec7e8c9b9190e7cab082d5c81cc6a42e9400b9fb..ee23e0e500baf9bb7b13b499916787c058e41063 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -1595,6 +1595,11 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
                             break;
                         }
                     }
+
+                    if (responseElement == null && (command.getAttribute("status").equals("completed") || command.getAttribute("status").equals("canceled"))) {
+                        removeSession(this);
+                        return;
+                    }
                 }
 
                 if (actionsAdapter.getCount() > 0) {