diff --git a/src/panels/config/core/ha-config-system-navigation.ts b/src/panels/config/core/ha-config-system-navigation.ts
index 22c5250849..6f1dba83e0 100644
--- a/src/panels/config/core/ha-config-system-navigation.ts
+++ b/src/panels/config/core/ha-config-system-navigation.ts
@@ -206,7 +206,9 @@ class HaConfigSystemNavigation extends LitElement {
       const hardwareInfo: HardwareInfo = await this.hass.callWS({
         type: "hardware/info",
       });
-      this._boardName = hardwareInfo?.hardware?.[0]?.name;
+      this._boardName = hardwareInfo?.hardware.find(
+        (hw) => hw.board !== null
+      )?.name;
     } else if (isHassioLoaded) {
       const osData: HassioHassOSInfo = await fetchHassioHassOsInfo(this.hass);
       if (osData.board) {
diff --git a/src/panels/config/hardware/ha-config-hardware.ts b/src/panels/config/hardware/ha-config-hardware.ts
index f04b06e039..83f664934d 100644
--- a/src/panels/config/hardware/ha-config-hardware.ts
+++ b/src/panels/config/hardware/ha-config-hardware.ts
@@ -176,9 +176,11 @@ class HaConfigHardware extends SubscribeMixin(LitElement) {
     let imageURL: string | undefined;
     let documentationURL: string | undefined;
 
-    if (this._hardwareInfo?.hardware.length) {
-      const boardData = this._hardwareInfo.hardware[0];
+    const boardData = this._hardwareInfo?.hardware.find(
+      (hw) => hw.board !== null
+    );
 
+    if (boardData) {
       boardId = boardData.board.hassio_board_id;
       boardName = boardData.name;
       documentationURL = boardData.url;