diff --git a/cast/src/receiver/layout/hc-main.ts b/cast/src/receiver/layout/hc-main.ts
index 0171dae5bb..bfefc08159 100644
--- a/cast/src/receiver/layout/hc-main.ts
+++ b/cast/src/receiver/layout/hc-main.ts
@@ -134,7 +134,13 @@ export class HcMain extends HassElement {
       this._error = err;
       return;
     }
-    const connection = await createConnection({ auth });
+    let connection;
+    try {
+      connection = await createConnection({ auth });
+    } catch (err) {
+      this._error = err;
+      return;
+    }
     if (this.hass) {
       this.hass.connection.close();
     }
diff --git a/package.json b/package.json
index 91704bd56e..cf9c05d948 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "fuse.js": "^3.4.4",
     "google-timezones-json": "^1.0.2",
     "hls.js": "^0.12.4",
-    "home-assistant-js-websocket": "4.3.1",
+    "home-assistant-js-websocket": "^4.4.0",
     "intl-messageformat": "^2.2.0",
     "jquery": "^3.4.0",
     "js-yaml": "^3.13.1",
diff --git a/src/cast/receiver_messages.ts b/src/cast/receiver_messages.ts
index b3d96c712b..5b2f82c5b2 100644
--- a/src/cast/receiver_messages.ts
+++ b/src/cast/receiver_messages.ts
@@ -14,7 +14,7 @@ export interface GetStatusMessage extends BaseCastMessage {
 export interface ConnectMessage extends BaseCastMessage {
   type: "connect";
   refreshToken: string;
-  clientId: string;
+  clientId: string | null;
   hassUrl: string;
 }
 
diff --git a/yarn.lock b/yarn.lock
index 7582f6ecf0..10a5ea9825 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6401,10 +6401,10 @@ hoek@6.x.x:
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.1.3.tgz#73b7d33952e01fe27a38b0457294b79dd8da242c"
   integrity sha512-YXXAAhmF9zpQbC7LEcREFtXfGq5K1fmd+4PHkBq8NUqmzW3G+Dq10bI/i0KucLRwss3YYFQ0fSfoxBZYiGUqtQ==
 
-home-assistant-js-websocket@4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/home-assistant-js-websocket/-/home-assistant-js-websocket-4.3.1.tgz#be320672b070cb4fcae2f1709a0eba1845ef7b31"
-  integrity sha512-eVIRdisSmcIzYKNSgB3gqUCrZpQkSUKlluYTsM0NqpUc4W0hHmF2vd8bShl3URWJXPOI5XPdeHuAPPqc0gUj+Q==
+home-assistant-js-websocket@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/home-assistant-js-websocket/-/home-assistant-js-websocket-4.4.0.tgz#676229112a2357b054ec26ed0f186940757bc826"
+  integrity sha512-B/7nDtlVv3Cz0PVteGjmpGI+Ksw+9Lf4VOM+dlMG1LErCH9uOJlLQV7vswx+7bzeGMuB9YeRDb64lqjoR0zpPg==
 
 homedir-polyfill@^1.0.1:
   version "1.0.3"