diff --git a/src/App.js b/src/App.js
index 511deed59e..eddbd92c9f 100755
--- a/src/App.js
+++ b/src/App.js
@@ -210,6 +210,10 @@ class Panel extends Component {
   }
 
   executeQuery = ()=> {
+    if (this.state.expr === '') {
+      return;
+    }
+
     if (this.abortInFlightFetch) {
       this.abortInFlightFetch();
       this.abortInFlightFetch = null;
@@ -219,10 +223,6 @@ class Panel extends Component {
     this.abortInFlightFetch = () => abortController.abort();
     this.setState({loading: true});
 
-    if (this.state.expr === '') {
-      return;
-    }
-
     let endTime = this.getEndTime() / 1000;
     let startTime = endTime - this.state.range;
     let resolution = this.state.resolution || Math.max(Math.floor(this.state.range / 250), 1);