diff --git a/lib/extension/homeassistant.ts b/lib/extension/homeassistant.ts
index 72882ad4b..3cbde4c65 100644
--- a/lib/extension/homeassistant.ts
+++ b/lib/extension/homeassistant.ts
@@ -1461,7 +1461,7 @@ export default class HomeAssistant extends Extension {
             }
         }
 
-        if (entity.isDevice() && entity.definition.ota) {
+        if (entity.isDevice() && entity.definition?.ota && message.hasOwnProperty('update')) {
             message['update']['installed_version'] = entity.zh.softwareBuildID;
         }
     }