diff --git a/superset/assets/javascripts/explore/components/DisplayQueryButton.jsx b/superset/assets/javascripts/explore/components/DisplayQueryButton.jsx
index da578cd65f739..ec5cdcd06351b 100644
--- a/superset/assets/javascripts/explore/components/DisplayQueryButton.jsx
+++ b/superset/assets/javascripts/explore/components/DisplayQueryButton.jsx
@@ -65,7 +65,10 @@ export default class DisplayQueryButton extends React.PureComponent {
     });
   }
   beforeOpen() {
-    if (['loading', null].indexOf(this.props.chartStatus) >= 0 || !this.props.queryResponse) {
+    if (
+      ['loading', null].indexOf(this.props.chartStatus) >= 0
+      || !this.props.queryResponse || !this.props.queryResponse.query
+    ) {
       this.fetchQuery();
     } else {
       this.setStateFromQueryResponse();