diff --git a/packages/app/src/System/Query.ts b/packages/app/src/System/Query.ts
index 0553511fd..0bdfe30be 100644
--- a/packages/app/src/System/Query.ts
+++ b/packages/app/src/System/Query.ts
@@ -92,6 +92,9 @@ export class Query {
     for (const c of this.#sentToRelays) {
       c.CloseReq(this.id);
     }
+    for (const sq of this.subQueries) {
+      sq.sendClose();
+    }
   }
 
   eose(sub: string, relay: string) {
diff --git a/packages/app/src/System/index.ts b/packages/app/src/System/index.ts
index d9ae4e2c4..37a279380 100644
--- a/packages/app/src/System/index.ts
+++ b/packages/app/src/System/index.ts
@@ -313,9 +313,7 @@ export class NostrSystem {
     let changed = false;
     for (const [k, v] of this.Queries) {
       if (v.closingAt && v.closingAt < now) {
-        if (v.leaveOpen) {
-          v.sendClose();
-        }
+        v.sendClose();
         this.Queries.delete(k);
         this.Feeds.delete(k);
         console.debug("Removed:", k);