diff --git a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesTaskRunner.java b/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesTaskRunner.java
index 72714d200b4d..313dfa68e329 100644
--- a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesTaskRunner.java
+++ b/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesTaskRunner.java
@@ -155,6 +155,7 @@ public ListenableFuture<TaskStatus> run(Task task)
     synchronized (tasks) {
       tasks.computeIfAbsent(
           task.getId(), k -> new K8sWorkItem(
+              client,
               task,
               exec.submit(() -> {
                 K8sTaskId k8sTaskId = new K8sTaskId(task);
@@ -375,7 +376,12 @@ public Collection<? extends TaskRunnerWorkItem> getKnownTasks()
       try {
         Task task = adapter.toTask(existingTask);
         ListenableFuture<TaskStatus> future = run(task);
-        result.add(new K8sWorkItem(task, future, DateTimes.of(existingTask.getMetadata().getCreationTimestamp())));
+        result.add(new K8sWorkItem(
+            client,
+            task,
+            future,
+            DateTimes.of(existingTask.getMetadata().getCreationTimestamp())
+        ));
       }
       catch (IOException e) {
         log.error("Error deserializing task from pod: " + existingTask.getMetadata().getName());
@@ -457,7 +463,12 @@ public Collection<TaskRunnerWorkItem> getRunningTasks()
       try {
         Task task = adapter.toTask(existingTask);
         ListenableFuture<TaskStatus> future = run(task);
-        result.add(new K8sWorkItem(task, future, DateTime.parse(existingTask.getMetadata().getCreationTimestamp())));
+        result.add(new K8sWorkItem(
+            client,
+            task,
+            future,
+            DateTime.parse(existingTask.getMetadata().getCreationTimestamp())
+        ));
       }
       catch (IOException e) {
         log.error("Error deserializing task from pod: " + existingTask.getMetadata().getName());
@@ -494,20 +505,28 @@ public RunnerTaskState getRunnerTaskState(String taskId)
     }
   }
 
-  public class K8sWorkItem extends TaskRunnerWorkItem
+  public static class K8sWorkItem extends TaskRunnerWorkItem
   {
     private final Task task;
+    private KubernetesPeonClient client;
 
-    private K8sWorkItem(Task task, ListenableFuture<TaskStatus> statusFuture)
+    public K8sWorkItem(KubernetesPeonClient client, Task task, ListenableFuture<TaskStatus> statusFuture)
     {
       super(task.getId(), statusFuture);
       this.task = task;
+      this.client = client;
     }
 
-    private K8sWorkItem(Task task, ListenableFuture<TaskStatus> statusFuture, DateTime createdTime)
+    public K8sWorkItem(
+        KubernetesPeonClient client,
+        Task task,
+        ListenableFuture<TaskStatus> statusFuture,
+        DateTime createdTime
+    )
     {
       super(task.getId(), statusFuture, createdTime, createdTime);
       this.task = task;
+      this.client = client;
     }
 
     @Override
@@ -516,6 +535,9 @@ public TaskLocation getLocation()
       K8sTaskId taskId = new K8sTaskId(task.getId());
       try {
         Pod mainPod = client.getMainJobPod(new K8sTaskId(task.getId()));
+        if (mainPod.getStatus() == null || mainPod.getStatus().getPodIP() == null) {
+          return TaskLocation.unknown();
+        }
         boolean tlsEnabled = Boolean.parseBoolean(
             mainPod.getMetadata()
                    .getAnnotations()
diff --git a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerTest.java b/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerTest.java
index 7546b7793acc..276098c8cded 100644
--- a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerTest.java
+++ b/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerTest.java
@@ -52,6 +52,7 @@
 import org.apache.druid.k8s.overlord.common.JobResponse;
 import org.apache.druid.k8s.overlord.common.K8sTaskAdapter;
 import org.apache.druid.k8s.overlord.common.K8sTaskId;
+import org.apache.druid.k8s.overlord.common.KubernetesPeonClient;
 import org.apache.druid.k8s.overlord.common.PeonCommandContext;
 import org.apache.druid.k8s.overlord.common.PeonPhase;
 import org.apache.druid.server.DruidNode;
@@ -161,7 +162,10 @@ void testAlreadyRunningJobInK8s() throws Exception
 
     when(peonClient.jobExists(eq(k8sTaskId))).thenReturn(Optional.of(job));
     when(peonClient.getMainJobPod(eq(k8sTaskId))).thenReturn(peonPod);
-    when(peonClient.waitForJobCompletion(eq(k8sTaskId), anyLong(), isA(TimeUnit.class))).thenReturn(new JobResponse(job, PeonPhase.SUCCEEDED));
+    when(peonClient.waitForJobCompletion(eq(k8sTaskId), anyLong(), isA(TimeUnit.class))).thenReturn(new JobResponse(
+        job,
+        PeonPhase.SUCCEEDED
+    ));
     when(peonClient.cleanUpJob(eq(k8sTaskId))).thenReturn(true);
 
     KubernetesTaskRunner taskRunner = new KubernetesTaskRunner(
@@ -214,7 +218,10 @@ void testJobNeedsToLaunchInK8s() throws Exception
     when(peonClient.jobExists(eq(k8sTaskId))).thenReturn(Optional.fromNullable(null));
     when(peonClient.launchJobAndWaitForStart(isA(Job.class), anyLong(), isA(TimeUnit.class))).thenReturn(peonPod);
     when(peonClient.getMainJobPod(eq(k8sTaskId))).thenReturn(peonPod);
-    when(peonClient.waitForJobCompletion(eq(k8sTaskId), anyLong(), isA(TimeUnit.class))).thenReturn(new JobResponse(job, PeonPhase.SUCCEEDED));
+    when(peonClient.waitForJobCompletion(eq(k8sTaskId), anyLong(), isA(TimeUnit.class))).thenReturn(new JobResponse(
+        job,
+        PeonPhase.SUCCEEDED
+    ));
     when(peonClient.cleanUpJob(eq(k8sTaskId))).thenReturn(true);
 
     KubernetesTaskRunner taskRunner = new KubernetesTaskRunner(
@@ -278,7 +285,10 @@ void testTheK8sRestartState() throws Exception
     when(peonClient.jobExists(eq(k8sTaskId))).thenReturn(Optional.of(job));
     when(peonClient.launchJobAndWaitForStart(isA(Job.class), anyLong(), isA(TimeUnit.class))).thenReturn(peonPod);
     when(peonClient.getMainJobPod(eq(k8sTaskId))).thenReturn(peonPod);
-    when(peonClient.waitForJobCompletion(eq(k8sTaskId), anyLong(), isA(TimeUnit.class))).thenReturn(new JobResponse(job, PeonPhase.SUCCEEDED));
+    when(peonClient.waitForJobCompletion(eq(k8sTaskId), anyLong(), isA(TimeUnit.class))).thenReturn(new JobResponse(
+        job,
+        PeonPhase.SUCCEEDED
+    ));
     when(peonClient.cleanUpJob(eq(k8sTaskId))).thenReturn(true);
 
     KubernetesTaskRunner taskRunner = new KubernetesTaskRunner(
@@ -339,7 +349,10 @@ void testTheK8sRestartStateAndHandleJobsThatAlreadyCompletedWhileDown() throws E
     when(peonClient.jobExists(eq(k8sTaskId))).thenReturn(Optional.of(job));
     when(peonClient.launchJobAndWaitForStart(isA(Job.class), anyLong(), isA(TimeUnit.class))).thenReturn(peonPod);
     when(peonClient.getMainJobPod(eq(k8sTaskId))).thenReturn(peonPod);
-    when(peonClient.waitForJobCompletion(eq(k8sTaskId), anyLong(), isA(TimeUnit.class))).thenReturn(new JobResponse(job, PeonPhase.SUCCEEDED));
+    when(peonClient.waitForJobCompletion(eq(k8sTaskId), anyLong(), isA(TimeUnit.class))).thenReturn(new JobResponse(
+        job,
+        PeonPhase.SUCCEEDED
+    ));
     when(peonClient.cleanUpJob(eq(k8sTaskId))).thenReturn(true);
 
     KubernetesTaskRunner taskRunner = new KubernetesTaskRunner(
@@ -427,6 +440,31 @@ void testMaxQueueSizeIsEnforced()
     ));
   }
 
+  @Test
+  void testWorkItemGetLocation()
+  {
+    KubernetesPeonClient client = mock(KubernetesPeonClient.class);
+    Pod pod = mock(Pod.class);
+    PodStatus status = mock(PodStatus.class);
+    when(status.getPodIP()).thenReturn(null).thenReturn("tweak");
+    when(pod.getStatus()).thenReturn(status);
+
+    ObjectMeta metadata = mock(ObjectMeta.class);
+    when(metadata.getAnnotations()).thenReturn(ImmutableMap.of(DruidK8sConstants.TLS_ENABLED, "false"));
+
+    when(pod.getMetadata()).thenReturn(metadata);
+    when(client.getMainJobPod(any())).thenReturn(pod);
+
+    Task task = mock(Task.class);
+    when(task.getId()).thenReturn("butters");
+    KubernetesTaskRunner.K8sWorkItem k8sWorkItem = new KubernetesTaskRunner.K8sWorkItem(client, task, null);
+    TaskLocation location = k8sWorkItem.getLocation();
+    assertEquals(TaskLocation.unknown(), location);
+
+    TaskLocation realLocation = k8sWorkItem.getLocation();
+    assertEquals(TaskLocation.create("tweak", DruidK8sConstants.PORT, DruidK8sConstants.TLS_PORT, false), realLocation);
+  }
+
   private Task makeTask()
   {
     return new TestableNoopTask(