diff --git a/lib/mqtt.ts b/lib/mqtt.ts
index bd591d5da8..3ce7970e35 100644
--- a/lib/mqtt.ts
+++ b/lib/mqtt.ts
@@ -127,7 +127,7 @@ export default class MQTT {
             {retain: true, qos: 0});
         this.eventBus.removeListeners(this);
         logger.info('Disconnecting from MQTT server');
-        this.client.end();
+        this.client?.end();
     }
 
     subscribe(topic: string): void {