diff --git a/appserver/monitoring-console/core/src/main/java/fish/payara/monitoring/runtime/MonitoringConsoleRuntimeImpl.java b/appserver/monitoring-console/core/src/main/java/fish/payara/monitoring/runtime/MonitoringConsoleRuntimeImpl.java
index 82e94d7645c..640b26b371f 100644
--- a/appserver/monitoring-console/core/src/main/java/fish/payara/monitoring/runtime/MonitoringConsoleRuntimeImpl.java
+++ b/appserver/monitoring-console/core/src/main/java/fish/payara/monitoring/runtime/MonitoringConsoleRuntimeImpl.java
@@ -168,6 +168,8 @@ public void postConstruct() {
     public void event(Event<?> event) {
         if (event.is(EventTypes.SERVER_READY)) {
             init();
+        } else if (event.is(EventTypes.PREPARE_SHUTDOWN)) {
+            setEnabled(false);
         }
     }