diff --git a/cdt-java-client/src/main/java/com/github/kklisura/cdt/services/WebSocketService.java b/cdt-java-client/src/main/java/com/github/kklisura/cdt/services/WebSocketService.java
index 50d68a38..5b4997fe 100644
--- a/cdt-java-client/src/main/java/com/github/kklisura/cdt/services/WebSocketService.java
+++ b/cdt-java-client/src/main/java/com/github/kklisura/cdt/services/WebSocketService.java
@@ -21,6 +21,8 @@
  */
 
 import com.github.kklisura.cdt.services.exceptions.WebSocketServiceException;
+
+import java.io.Closeable;
 import java.net.URI;
 import java.util.function.Consumer;
 
@@ -29,7 +31,7 @@
  *
  * @author Kenan Klisura
  */
-public interface WebSocketService {
+public interface WebSocketService extends Closeable {
   /**
    * Connects to a specified URI.
    *
diff --git a/cdt-java-client/src/main/java/com/github/kklisura/cdt/services/impl/WebSocketServiceImpl.java b/cdt-java-client/src/main/java/com/github/kklisura/cdt/services/impl/WebSocketServiceImpl.java
index 27c08f3d..05bcb6b6 100644
--- a/cdt-java-client/src/main/java/com/github/kklisura/cdt/services/impl/WebSocketServiceImpl.java
+++ b/cdt-java-client/src/main/java/com/github/kklisura/cdt/services/impl/WebSocketServiceImpl.java
@@ -156,8 +156,10 @@ public void onMessage(String message) {
   @Override
   public void close() {
     try {
-      session.close();
-      session = null;
+      if (session != null) {
+        session.close();
+        session = null;
+      }
     } catch (IOException e) {
       LOGGER.error("Failed closing ws session on {}...", session.getRequestURI(), e);
     }