diff --git a/lib/ansible/executor/task_executor.py b/lib/ansible/executor/task_executor.py
index f45b56af855..fb6e1908a75 100644
--- a/lib/ansible/executor/task_executor.py
+++ b/lib/ansible/executor/task_executor.py
@@ -423,9 +423,11 @@ class TaskExecutor:
 
         # Read some values from the task, so that we can modify them if need be
         if self._task.until:
-            retries = self._task.retries
+            retries = self._task.retries + 1
             if retries is None:
                 retries = 3
+            elif retries <= 0:
+                retries = 1
         else:
             retries = 1