diff --git a/python/mozbuild/mozbuild/artifact_commands.py b/python/mozbuild/mozbuild/artifact_commands.py
index fea86658cb1e..20e882c82771 100644
--- a/python/mozbuild/mozbuild/artifact_commands.py
+++ b/python/mozbuild/mozbuild/artifact_commands.py
@@ -428,8 +428,9 @@ class PackageFrontend(MachCommandBase):
                     },
                     "Searching for {name} in {index}",
                 )
+                deadline = None
                 task_id = IndexSearch().should_replace_task(
-                    task, {}, task.optimization.get("index-search", [])
+                    task, {}, deadline, task.optimization.get("index-search", [])
                 )
                 if task_id in (True, False) or not artifact_name:
                     self.log(
diff --git a/taskcluster/taskgraph/docker.py b/taskcluster/taskgraph/docker.py
index ffb85bb1b60f..f47c432770d2 100644
--- a/taskcluster/taskgraph/docker.py
+++ b/taskcluster/taskgraph/docker.py
@@ -26,8 +26,9 @@ def load_image_by_name(image_name, tag=None):
     params = {"level": six.ensure_text(os.environ.get("MOZ_SCM_LEVEL", "3"))}
     tasks = load_tasks_for_kind(params, "docker-image")
     task = tasks["docker-image-{}".format(image_name)]
+    deadline = None
     task_id = IndexSearch().should_replace_task(
-        task, {}, task.optimization.get("index-search", [])
+        task, {}, deadline, task.optimization.get("index-search", [])
     )
 
     if task_id in (True, False):