From 41934320c0767e57de68d054a773742377a6567e Mon Sep 17 00:00:00 2001
From: Ludeeus <ludeeus@ludeeus.dev>
Date: Tue, 4 May 2021 19:16:51 +0000
Subject: [PATCH] Expect the connection to be lost

---
 src/components/buttons/ha-call-service-button.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/components/buttons/ha-call-service-button.js b/src/components/buttons/ha-call-service-button.js
index 391c9b8e22..96666cf5d3 100644
--- a/src/components/buttons/ha-call-service-button.js
+++ b/src/components/buttons/ha-call-service-button.js
@@ -69,10 +69,16 @@ class HaCallServiceButton extends EventsMixin(PolymerElement) {
           el.$.progress.actionSuccess();
           eventData.success = true;
         },
-        function () {
+        function (err) {
+          if (err?.error?.message && err.error.message === "Connection lost") {
+            // We expect the service call to fail with 'Connection lost' when we restart or stop
+            el.$.progress.actionSuccess();
+            eventData.success = true;
+          } else {
+            el.$.progress.actionError();
+            eventData.success = false;
+          }
           el.progress = false;
-          el.$.progress.actionError();
-          eventData.success = false;
         }
       )
       .then(function () {