diff --git a/superset/assets/javascripts/SqlLab/components/ResultSet.jsx b/superset/assets/javascripts/SqlLab/components/ResultSet.jsx
index 13c41969303..69c9b6fc435 100644
--- a/superset/assets/javascripts/SqlLab/components/ResultSet.jsx
+++ b/superset/assets/javascripts/SqlLab/components/ResultSet.jsx
@@ -46,6 +46,10 @@ class ResultSet extends React.PureComponent {
         this.clearQueryResults(nextProps.query)
       );
     }
+    if (nextProps.query.resultsKey
+      && nextProps.query.resultsKey !== this.props.query.resultsKey) {
+      this.fetchResults(nextProps.query);
+    }
   }
   getControls() {
     if (this.props.search || this.props.visualize || this.props.csv) {
@@ -197,20 +201,6 @@ class ResultSet extends React.PureComponent {
             </div>
           </div>
         );
-      } else if (query.resultsKey) {
-        if (results && data && data.length === 0) {
-          // if fetched result contains zero rows of data
-          return <Alert bsStyle="warning">The asynchronous query returned no data</Alert>;
-        }
-        return (
-          <div>
-            <Alert bsStyle="warning">This query was run asynchronously &nbsp;
-              <Button bsSize="sm" onClick={this.fetchResults.bind(this, query)}>
-                Fetch results
-              </Button>
-            </Alert>
-          </div>
-        );
       }
     }
     if (query.cached) {