diff --git a/src/common/k8s-api/kube-object.store.ts b/src/common/k8s-api/kube-object.store.ts
index 58502a3097..2ebeafc175 100644
--- a/src/common/k8s-api/kube-object.store.ts
+++ b/src/common/k8s-api/kube-object.store.ts
@@ -157,7 +157,7 @@ export abstract class KubeObjectStore<
     return [];
   }
 
-  getById(id: string | undefined): K | undefined {
+  getById(id: string): K | undefined {
     return this.items.find(item => item.getId() === id);
   }
 
diff --git a/src/extensions/renderer-api/components.ts b/src/extensions/renderer-api/components.ts
index 12f7120c8c..6946a8aa66 100644
--- a/src/extensions/renderer-api/components.ts
+++ b/src/extensions/renderer-api/components.ts
@@ -109,8 +109,8 @@ export const logTabStore = asLegacyGlobalObjectForExtensionApiWithModifications(
     createPodTab: asLegacyGlobalFunctionForExtensionApi(createPodLogsTabInjectable),
     createWorkloadTab: asLegacyGlobalFunctionForExtensionApi(createWorkloadLogsTabInjectable),
     renameTab: (tabId: string): void => {
-      const tabData = logTabStore.getData(tabId);
-      const pod = podStore.getById(tabData?.selectedPodId);
+      const { selectedPodId } = logTabStore.getData(tabId) ?? {};
+      const pod = selectedPodId && podStore.getById(selectedPodId);
 
       if (pod) {
         renameTab(tabId, `Pod ${pod.getName()}`);