From fd7351ff61826cd011e5733359738d3b7a25dc14 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Sat, 28 Aug 2021 14:06:47 +0200
Subject: [PATCH] Small availability fixes. #6281

---
 lib/extension/availabilityNew.ts | 2 +-
 lib/extension/homeassistant.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/extension/availabilityNew.ts b/lib/extension/availabilityNew.ts
index 529bcfd62..b60c7140d 100644
--- a/lib/extension/availabilityNew.ts
+++ b/lib/extension/availabilityNew.ts
@@ -199,7 +199,7 @@ class AvailabilityNew extends ExtensionTS {
             }, seconds(2));
         }
 
-        this.retrieveStateDebouncers[rd.device.ieeeAddr]();
+        this.retrieveStateDebouncers[rd.device.ieeeAddr]?.();
     }
 }
 
diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js
index 188c5ee62..fcccbb0a5 100644
--- a/lib/extension/homeassistant.js
+++ b/lib/extension/homeassistant.js
@@ -858,7 +858,7 @@ class HomeAssistant extends Extension {
             payload.availability_mode = 'all';
             /* istanbul ignore next */
             const availabilityEnabled = settings.get().experimental.availability_new ?
-                utils.isAvailabilityEnabledForDevice(resolvedEntity, settings) :
+                utils.isAvailabilityEnabledForDevice(resolvedEntity, settings.get()) :
                 settings.get().advanced.availability_timeout;
             if (resolvedEntity.type === 'device' && availabilityEnabled) {
                 payload.availability.push({topic: `${settings.get().mqtt.base_topic}/${friendlyName}/availability`});