diff --git a/src/state/connection-mixin.ts b/src/state/connection-mixin.ts
index 2d1c437117..cda1c797ec 100644
--- a/src/state/connection-mixin.ts
+++ b/src/state/connection-mixin.ts
@@ -84,7 +84,7 @@ export const connectionMixin = <T extends Constructor<HassBaseEl>>(
               err.error?.code === ERR_CONNECTION_LOST &&
               serviceCallWillDisconnect(domain, service)
             ) {
-              throw err;
+              return { context: { id: "" } };
             }
             if (__DEV__) {
               // eslint-disable-next-line no-console