diff --git a/helper/buildmanager.php b/helper/buildmanager.php
index d6158e1..ecc1693 100644
--- a/helper/buildmanager.php
+++ b/helper/buildmanager.php
@@ -692,7 +692,7 @@ public function getBuildTasks($amount = PHP_INT_MAX)
 
         // get the oldest task first
         $rows = $this->db->queryAll(
-            'SELECT TaskID FROM Tasks WHERE State = ? ORDER BY Timestamp ASC LIMIT ?',
+            'SELECT TaskID FROM Tasks WHERE TaskID IS NOT NULL AND State = ? ORDER BY Timestamp ASC LIMIT ?',
             [self::STATE_SCHEDULED, $amount]
         );