diff --git a/lib/extension/homeassistant.ts b/lib/extension/homeassistant.ts
index bb38d2ff..3fa8f4f0 100644
--- a/lib/extension/homeassistant.ts
+++ b/lib/extension/homeassistant.ts
@@ -1333,6 +1333,8 @@ export default class HomeAssistant extends Extension {
             data.message.toLowerCase() === 'online') {
             const timer = setTimeout(async () => {
                 // Publish all device states.
+                this.mqtt.publishStateOnline();
+                this.eventBus.emitPublishAvailability();
                 for (const entity of [...this.zigbee.devices(false), ...this.zigbee.groups()]) {
                     if (this.state.exists(entity)) {
                         this.publishEntityState(entity, this.state.get(entity), 'publishCached');