diff --git a/lib/src/main/java/xyz/gianlu/librespot/ZeroconfServer.java b/lib/src/main/java/xyz/gianlu/librespot/ZeroconfServer.java
index 7433168a..ed8699dd 100644
--- a/lib/src/main/java/xyz/gianlu/librespot/ZeroconfServer.java
+++ b/lib/src/main/java/xyz/gianlu/librespot/ZeroconfServer.java
@@ -201,9 +201,10 @@ public void close() throws IOException {
     }
 
     public void closeSession() throws IOException {
-        sessionListeners.forEach(l -> l.sessionClosing(session));
+        if (session == null) return;
 
-        if (session != null) session.close();
+        sessionListeners.forEach(l -> l.sessionClosing(session));
+        session.close();
         session = null;
     }