diff --git a/superset/assets/src/SqlLab/components/QueryAutoRefresh.jsx b/superset/assets/src/SqlLab/components/QueryAutoRefresh.jsx
index 21d335b03..6704d393f 100644
--- a/superset/assets/src/SqlLab/components/QueryAutoRefresh.jsx
+++ b/superset/assets/src/SqlLab/components/QueryAutoRefresh.jsx
@@ -40,13 +40,8 @@ class QueryAutoRefresh extends React.PureComponent {
     // if there are started or running queries, this method should return true
     const { queries } = this.props;
     const now = new Date().getTime();
-
-    // due to a race condition, queries can be marked as successful before the
-    // results key is set; this is a workaround until we fix the underlying
-    // problem
     const isQueryRunning = q => (
-      ['running', 'started', 'pending', 'fetching'].indexOf(q.state) >= 0 ||
-      (q.state === 'success' && q.resultsKey === null)
+      ['running', 'started', 'pending', 'fetching'].indexOf(q.state) >= 0
     );
 
     return (