diff --git a/queue_job/jobrunner/runner.py b/queue_job/jobrunner/runner.py
index 7f935c63d..4e662ebf4 100644
--- a/queue_job/jobrunner/runner.py
+++ b/queue_job/jobrunner/runner.py
@@ -333,6 +333,7 @@ def _query_requeue_dead_jobs(self):
                     CASE
                         WHEN
                             max_retries IS NOT NULL AND
+                            max_retries != 0 AND -- infinite retries if max_retries is 0
                             retry IS NOT NULL AND
                             retry>max_retries
                         THEN 'failed'
@@ -343,6 +344,7 @@ def _query_requeue_dead_jobs(self):
                     CASE
                         WHEN
                             max_retries IS NOT NULL AND
+                            max_retries != 0 AND -- infinite retries if max_retries is 0
                             retry IS NOT NULL AND
                             retry>max_retries
                         THEN 'JobFoundDead'
@@ -352,6 +354,7 @@ def _query_requeue_dead_jobs(self):
                     CASE
                         WHEN
                             max_retries IS NOT NULL AND
+                            max_retries != 0 AND -- infinite retries if max_retries is 0
                             retry IS NOT NULL AND
                             retry>max_retries
                         THEN 'Job found dead after too many retries'