diff --git a/superset/assets/javascripts/SqlLab/components/ResultSet.jsx b/superset/assets/javascripts/SqlLab/components/ResultSet.jsx
index 003d0745d..13c419693 100644
--- a/superset/assets/javascripts/SqlLab/components/ResultSet.jsx
+++ b/superset/assets/javascripts/SqlLab/components/ResultSet.jsx
@@ -198,6 +198,10 @@ class ResultSet extends React.PureComponent {
           </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;