diff --git a/redash/models/__init__.py b/redash/models/__init__.py
index ce3446c916..172c6aeabb 100644
--- a/redash/models/__init__.py
+++ b/redash/models/__init__.py
@@ -389,6 +389,8 @@ def groups(self):
 def should_schedule_next(previous_iteration, now, interval, time=None, day_of_week=None, failures=0):
     # if time exists then interval > 23 hours (82800s)
     # if day_of_week exists then interval > 6 days (518400s)
+    if previous_iteration is None:
+        return False
     if time is None:
         ttl = int(interval)
         next_iteration = previous_iteration + datetime.timedelta(seconds=ttl)
@@ -608,17 +610,23 @@ def outdated_queries(cls):
                     if schedule_until <= now:
                         continue
 
+                if all(value is None for value in query.schedule.values()):
+                    continue
+
                 retrieved_at = scheduled_queries_executions.get(query.id) or (
                     query.latest_query_data and query.latest_query_data.retrieved_at
                 )
 
-                if should_schedule_next(
-                    retrieved_at or now,
-                    now,
-                    query.schedule["interval"],
-                    query.schedule["time"],
-                    query.schedule["day_of_week"],
-                    query.schedule_failures,
+                if (
+                    should_schedule_next(
+                        retrieved_at,
+                        now,
+                        query.schedule["interval"],
+                        query.schedule["time"],
+                        query.schedule["day_of_week"],
+                        query.schedule_failures,
+                    )
+                    or not retrieved_at
                 ):
                     key = "{}:{}".format(query.query_hash, query.data_source_id)
                     outdated_queries[key] = query
diff --git a/tests/test_models.py b/tests/test_models.py
index f7d563aaae..97fcfddfd6 100644
--- a/tests/test_models.py
+++ b/tests/test_models.py
@@ -216,6 +216,20 @@ def test_enqueues_query_only_once(self):
 
         self.assertEqual(list(models.Query.outdated_queries()), [query2])
 
+    def test_enqueues_scheduled_query_without_latest_query_data(self):
+        """
+        Queries with a schedule but no latest_query_data will still be reported by Query.outdated_queries()
+        """
+        query = self.factory.create_query(
+            schedule=self.schedule(interval="60"),
+            data_source=self.factory.create_data_source(),
+        )
+
+        outdated_queries = models.Query.outdated_queries()
+        self.assertEqual(query.latest_query_data, None)
+        self.assertEqual(len(outdated_queries), 1)
+        self.assertIn(query, outdated_queries)
+
     def test_enqueues_query_with_correct_data_source(self):
         """
         Queries from different data sources will be reported by