diff --git a/lib/extension/availabilityNew.ts b/lib/extension/availabilityNew.ts
index 631f5b5bd..a3769adb4 100644
--- a/lib/extension/availabilityNew.ts
+++ b/lib/extension/availabilityNew.ts
@@ -11,6 +11,7 @@ const seconds = (seconds: number): number => 1000 * seconds;
 // - State retrieval
 // - Home Assistant add availability mode
 // - Honour legacy availability_timeout, availability_blocklist and availability_passlist options.
+// - Enable for HA addon
 class AvailabilityNew extends ExtensionTS {
     private timers: {[s: string]: NodeJS.Timeout} = {};
     private availabilityCache: {[s: string]: boolean} = {};
diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js
index a08031cd3..cc684b120 100644
--- a/lib/extension/homeassistant.js
+++ b/lib/extension/homeassistant.js
@@ -855,7 +855,9 @@ class HomeAssistant extends Extension {
 
             // Availability payload
             payload.availability = [{topic: `${settings.get().mqtt.base_topic}/bridge/state`}];
-            if (settings.get().advanced.availability_timeout || settings.get().availability) {
+            const availabilityEnabled = settings.get().availability || settings.get().advanced.availability_timeout ||
+                resolvedEntity.settings.availability;
+            if (resolvedEntity.type === 'device' && availabilityEnabled) {
                 payload.availability.push({topic: `${settings.get().mqtt.base_topic}/${friendlyName}/availability`});
             }