diff --git a/public/app/features/panel/query_editor_row.ts b/public/app/features/panel/query_editor_row.ts
index 10782b2c420..84cc597e388 100644
--- a/public/app/features/panel/query_editor_row.ts
+++ b/public/app/features/panel/query_editor_row.ts
@@ -79,6 +79,7 @@ export class QueryRowCtrl {
   }
 
   removeQuery() {
+    delete this.panelCtrl.__collapsedQueryCache[this.target.refId];
     this.panel.targets = _.without(this.panel.targets, this.target);
     this.panelCtrl.refresh();
   }