diff --git a/src-admin/src/Tabs/Bridges.tsx b/src-admin/src/Tabs/Bridges.tsx
index 5944624..73881ce 100644
--- a/src-admin/src/Tabs/Bridges.tsx
+++ b/src-admin/src/Tabs/Bridges.tsx
@@ -956,9 +956,9 @@ export class Bridges extends BridgesAndDevices<BridgesProps, BridgesState> {
                 devicesInBridge={this.props.matter.bridges[this.state.addDeviceDialog.bridgeIndex].list.length}
                 checkAddedDevices={
                     this.props.nodeStates[this.props.matter.bridges[this.state.addDeviceDialog.bridgeIndex].uuid]
-                        .status === 'waitingForCommissioning'
-                        ? MAX_UN_COMMISSIONED_DEVICES
-                        : 0
+                        ?.status !== 'waitingForCommissioning'
+                        ? 0
+                        : MAX_UN_COMMISSIONED_DEVICES
                 }
                 matter={this.props.matter}
                 socket={this.props.socket}
diff --git a/src-admin/src/Tabs/BridgesAndDevices.tsx b/src-admin/src/Tabs/BridgesAndDevices.tsx
index 221a37d..72554d1 100644
--- a/src-admin/src/Tabs/BridgesAndDevices.tsx
+++ b/src-admin/src/Tabs/BridgesAndDevices.tsx
@@ -713,8 +713,9 @@ class BridgesAndDevices<TProps extends BridgesAndDevicesProps, TState extends Br
                             'All information of this device or bridge will be deleted and you must reconnect (with PIN or QR code) again.',
                         )}
                     </p>
-                    {this.props.nodeStates[this.state.showResetDialog.bridgeOrDevice.uuid].status !==
-                    'waitingForCommissioning' ? (
+                    {this.props.nodeStates[this.state.showResetDialog.bridgeOrDevice.uuid] &&
+                    this.props.nodeStates[this.state.showResetDialog.bridgeOrDevice.uuid].status !==
+                        'waitingForCommissioning' ? (
                         <p style={{ color: this.props.themeType === 'dark' ? '#9c0a0a' : '#910000' }}>
                             {I18n.t(
                                 'This device/bridge is linked to some ecosystem. If it is deleted here, you must manually remove it from your ecosystem!',