diff --git a/addOns/websocket/CHANGELOG.md b/addOns/websocket/CHANGELOG.md
index f3f9957a3ba..5581636ff3a 100644
--- a/addOns/websocket/CHANGELOG.md
+++ b/addOns/websocket/CHANGELOG.md
@@ -4,7 +4,8 @@ All notable changes to this add-on will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## Unreleased
-
+### Fixed
+- Correct shutdown state.
 
 ## [35] - 2025-12-15
 ### Changed
diff --git a/addOns/websocket/src/main/java/org/zaproxy/zap/extension/websocket/ExtensionWebSocket.java b/addOns/websocket/src/main/java/org/zaproxy/zap/extension/websocket/ExtensionWebSocket.java
index 4b2ca432d9b..0cd0ff609d4 100644
--- a/addOns/websocket/src/main/java/org/zaproxy/zap/extension/websocket/ExtensionWebSocket.java
+++ b/addOns/websocket/src/main/java/org/zaproxy/zap/extension/websocket/ExtensionWebSocket.java
@@ -495,9 +495,13 @@ public void stop() {
         if (webSocketPassiveScannerManager != null) {
             webSocketPassiveScannerManager.shutdownThread();
             extensionScript.removeScriptType(websocketPassiveScanScriptType);
+            webSocketPassiveScannerManager = null;
         }
 
-        eventPublisher.shutdown();
+        if (eventPublisher != null) {
+            eventPublisher.shutdown();
+            eventPublisher = null;
+        }
     }
 
     @Override