diff --git a/src/components/device-page/info.tsx b/src/components/device-page/info.tsx
index 4df5b666f..44150c2aa 100644
--- a/src/components/device-page/info.tsx
+++ b/src/components/device-page/info.tsx
@@ -39,7 +39,7 @@ export class DeviceInfo extends Component<
     render(): JSX.Element {
         const { device, deviceStates, bridgeInfo, availability, t } = this.props;
         const { configureDevice, renameDevice, removeDevice, setDeviceDescription, interviewDevice } = this.props;
-        const homeassistantEnabled = !!bridgeInfo.config?.homeassistant;
+        const homeassistantEnabled = !!bridgeInfo.config?.homeassistant?.enabled;
         const deviceState: DeviceState = deviceStates[device.friendly_name] ?? ({} as DeviceState);
 
         const displayProps = [
@@ -87,7 +87,7 @@ export class DeviceInfo extends Component<
                     availability: AvailabilityState,
                 ) => {
                     const { config } = bridgeInfo;
-                    const availabilityFeatureEnabled = !!config.availability;
+                    const availabilityFeatureEnabled = !!config.availability?.enabled;
                     const availabilityEnabledForDevice = config.devices[device.ieee_address]?.availability !== false;
 
                     return (
diff --git a/src/components/zigbee/index.tsx b/src/components/zigbee/index.tsx
index d5dbc342f..c82f3c659 100644
--- a/src/components/zigbee/index.tsx
+++ b/src/components/zigbee/index.tsx
@@ -34,8 +34,8 @@ function DevicesPage(props: DevicesPageProps): JSX.Element {
         availability,
     } = props;
     const { renameDevice, removeDevice, configureDevice, setDeviceDescription, interviewDevice } = props;
-    const availabilityFeatureEnabled = !!config.availability;
-    const homeassistantEnabled = !!config?.homeassistant;
+    const availabilityFeatureEnabled = !!config.availability?.enabled;
+    const homeassistantEnabled = !!config?.homeassistant?.enabled;
     const getDevicesToRender = (): DevicesPageData[] => {
         return Object.values<Device>(devices)
             .filter((device) => device.type !== 'Coordinator')
diff --git a/src/types.ts b/src/types.ts
index 3abca493b..1b6630f9e 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -87,7 +87,12 @@ export interface AdvancedConfig {
     legacy_api: boolean;
 }
 export interface Z2MConfig {
-    homeassistant: boolean;
+    homeassistant?: {
+        enabled: boolean;
+    };
+    availability?: {
+        enabled: boolean;
+    };
     advanced: AdvancedConfig;
     devices: Record<string, DeviceConfig>;
     device_options: DeviceConfig;