diff --git a/src/components/ota-page/index.tsx b/src/components/ota-page/index.tsx
index 34c6a20df..ac531eb02 100644
--- a/src/components/ota-page/index.tsx
+++ b/src/components/ota-page/index.tsx
@@ -189,7 +189,7 @@ class OtaPage extends Component<PropsFromStore & OtaApi & WithTranslation<'ota'>
                 accessor: ({ state }) => {
                     const installed_version = ((state?.update ?? {}) as OTAState).installed_version;
 
-                    if (typeof installed_version === 'number' && installed_version)
+                    if (typeof installed_version === 'number' && installed_version >= 0)
                         return fileVersion2String(installed_version);
                     else return t('zigbee:firmware_installed_version_na');
                 },
@@ -199,7 +199,8 @@ class OtaPage extends Component<PropsFromStore & OtaApi & WithTranslation<'ota'>
                 accessor: ({ state }) => {
                     const latest_version = ((state?.update ?? {}) as OTAState).latest_version;
 
-                    if (typeof latest_version === 'number' && latest_version) return fileVersion2String(latest_version);
+                    if (typeof latest_version === 'number' && latest_version >= 0)
+                        return fileVersion2String(latest_version);
                     else return 'N/A';
                 },
             },
diff --git a/ws-messages/onConnect.json b/ws-messages/onConnect.json
index 0d7d26eec..bab71c058 100644
--- a/ws-messages/onConnect.json
+++ b/ws-messages/onConnect.json
@@ -8694,7 +8694,7 @@
         "topic": "dining room/ac power/availability"
     },
     {
-        "payload": "offline",
+        "payload": "online",
         "topic": "0x0017880103d55d65/availability"
     },
     {
@@ -8858,7 +8858,12 @@
             "brightness": 110,
             "color_mode": "xy",
             "last_seen": "2022-04-15T17:48:30+08:00",
-            "state": "ON"
+            "state": "ON",
+            "update": {
+                "installed_version": -1,
+                "latest_version": -1,
+                "state": "unknown"
+	    }
         },
         "topic": "0x0017880103d55d65"
     }