diff --git a/bundles/org.openhab.binding.tibber/src/main/java/org/openhab/binding/tibber/internal/handler/TibberHandler.java b/bundles/org.openhab.binding.tibber/src/main/java/org/openhab/binding/tibber/internal/handler/TibberHandler.java
index 7317b5f89e35b..2bdc03723384b 100755
--- a/bundles/org.openhab.binding.tibber/src/main/java/org/openhab/binding/tibber/internal/handler/TibberHandler.java
+++ b/bundles/org.openhab.binding.tibber/src/main/java/org/openhab/binding/tibber/internal/handler/TibberHandler.java
@@ -356,10 +356,12 @@ public void close() {
             this.session = null;
             this.socket = null;
         }
+        Future<?> sessionFuture = this.sessionFuture;
         if (sessionFuture != null && !sessionFuture.isDone()) {
             sessionFuture.cancel(true);
         }
-        if (client != null && client.isStarted()) {
+        WebSocketClient client = this.client;
+        if (client != null) {
             try {
                 client.stop();
             } catch (Exception e) {