diff --git a/src/panels/config/integrations/integration-panels/thread/dialog-thread-dataset.ts b/src/panels/config/integrations/integration-panels/thread/dialog-thread-dataset.ts
index ee305d6825ab..191049ecf663 100644
--- a/src/panels/config/integrations/integration-panels/thread/dialog-thread-dataset.ts
+++ b/src/panels/config/integrations/integration-panels/thread/dialog-thread-dataset.ts
@@ -72,8 +72,11 @@ class DialogThreadDataset extends LitElement implements HassDialog {
       type: "thread/store_in_platform_keychain",
       payload: {
         mac_extended_address:
+          this._params?.network.dataset?.preferred_extended_address ||
           this._params!.network.routers![0]!.extended_address,
-        border_agent_id: this._params!.network.routers![0]!.border_agent_id,
+        border_agent_id:
+          this._params?.network.dataset?.preferred_border_agent_id ||
+          this._params!.network.routers![0]!.border_agent_id,
         active_operational_dataset: this._params!.otbrInfo!.active_dataset_tlvs,
       },
     });