diff --git a/XIONControlPanel/Servers/HomeAssistantServer.swift b/XIONControlPanel/Servers/HomeAssistantServer.swift
index ad5f116..ddcfa79 100644
--- a/XIONControlPanel/Servers/HomeAssistantServer.swift
+++ b/XIONControlPanel/Servers/HomeAssistantServer.swift
@@ -57,6 +57,9 @@ class HomeAssistantServer: Server
     }
     
     func disconnect(_ completion: ((any Error)?) -> Void) {
+        self.eventTask?.cancel()
+        self.eventTask = nil
+        
         Task { await liaison.disconnect() }
         completion(nil)
     }
@@ -202,7 +205,7 @@ class HomeAssistantServer: Server
         device.state = switch event.data.newState.state {
             case .on:  .on
             case .off: .off
-            case .other(let string): .off
+            case .other(_): .off
         }
         
         delegate?.server(self, deviceChangedState: device.eraseToAnyDevice())