diff --git a/src/data/thread.ts b/src/data/thread.ts
index 0af2cbd273..2ff0e8b145 100644
--- a/src/data/thread.ts
+++ b/src/data/thread.ts
@@ -1,24 +1,29 @@
 import { HomeAssistant } from "../types";
 
 export interface ThreadRouter {
+  addresses: [string];
+  border_agent_id: string | null;
   brand: "google" | "apple" | "homeassistant";
-  server: string;
-  extended_pan_id: string;
   extended_address: string;
+  extended_pan_id: string;
   model_name: string | null;
-  network_name: string;
-  vendor_name: string;
+  network_name: string | null;
+  server: string | null;
+  thread_version: string | null;
+  unconfigured: boolean | null;
+  vendor_name: string | null;
 }
 
 export interface ThreadDataSet {
+  channel: number | null;
   created: string;
   dataset_id: string;
+  extended_pan_id: string | null;
+  network_name: string;
+  pan_id: string | null;
+  preferred_border_agent_id: string | null;
   preferred: boolean;
   source: string;
-  network_name: string;
-  extended_pan_id?: string;
-  pan_id?: string;
-  channel?: number;
 }
 
 export interface ThreadRouterDiscoveryEvent {
diff --git a/src/panels/config/integrations/integration-panels/thread/thread-config-panel.ts b/src/panels/config/integrations/integration-panels/thread/thread-config-panel.ts
index 2fdea52d73..7aa43d3770 100644
--- a/src/panels/config/integrations/integration-panels/thread/thread-config-panel.ts
+++ b/src/panels/config/integrations/integration-panels/thread/thread-config-panel.ts
@@ -183,7 +183,9 @@ export class ThreadConfigPanel extends SubscribeMixin(LitElement) {
                     @error=${this._onImageError}
                     @load=${this._onImageLoad}
                   />
-                  ${router.model_name || router.server.replace(".local.", "")}
+                  ${router.model_name ||
+                  router.server?.replace(".local.", "") ||
+                  ""}
                   <span slot="secondary">${router.server}</span>
                   ${router.extended_address === this._otbrInfo?.extended_address
                     ? html`<ha-button-menu
@@ -311,7 +313,10 @@ export class ThreadConfigPanel extends SubscribeMixin(LitElement) {
         if (network in networks) {
           networks[network].routers!.push(router);
         } else {
-          networks[network] = { name: router.network_name, routers: [router] };
+          networks[network] = {
+            name: router.network_name || "",
+            routers: [router],
+          };
         }
       }
       for (const dataset of datasets) {