diff --git a/src/main/java/org/qortal/api/websocket/ApiWebSocket.java b/src/main/java/org/qortal/api/websocket/ApiWebSocket.java
index 87ee16cd..f6a439ea 100644
--- a/src/main/java/org/qortal/api/websocket/ApiWebSocket.java
+++ b/src/main/java/org/qortal/api/websocket/ApiWebSocket.java
@@ -107,7 +107,9 @@ abstract class ApiWebSocket extends WebSocketServlet {
 
 	public void onWebSocketClose(Session session, int statusCode, String reason) {
 		synchronized (SESSIONS_BY_CLASS) {
-			SESSIONS_BY_CLASS.get(this.getClass()).remove(session);
+			List<Session> sessions = SESSIONS_BY_CLASS.get(this.getClass());
+			if (sessions != null)
+				sessions.remove(session);
 		}
 	}