diff --git a/redash/tasks/queries.py b/redash/tasks/queries.py
index a83ab3242e..fa4b9d6891 100644
--- a/redash/tasks/queries.py
+++ b/redash/tasks/queries.py
@@ -323,7 +323,7 @@ def run(self):
 
         _unlock(self.query_hash, self.data_source.id)
 
-        if error:
+        if error is not None and data is None:
             result = QueryExecutionError(error)
             if self.scheduled_query is not None:
                 self.scheduled_query = models.db.session.merge(self.scheduled_query, load=False)