diff --git a/src/cli/onefuzz/api.py b/src/cli/onefuzz/api.py
index 1bdeff1f2..ff72cbc8c 100644
--- a/src/cli/onefuzz/api.py
+++ b/src/cli/onefuzz/api.py
@@ -930,7 +930,7 @@ class Tasks(Endpoint):
     def list(
         self,
         job_id: Optional[UUID_EXPANSION] = None,
-        state: Optional[List[enums.TaskState]] = enums.TaskState.available(),
+        state: Optional[List[enums.TaskState]] = None,
     ) -> List[models.Task]:
         """Get information about all tasks"""
         self.logger.debug("list tasks")
@@ -943,6 +943,9 @@ class Tasks(Endpoint):
                 lambda: [str(x.job_id) for x in self.onefuzz.jobs.list()],
             )
 
+        if job_id_expanded is None and state is None:
+            state = enums.TaskState.available()
+
         return self._req_model_list(
             "GET",
             models.Task,