diff --git a/common/src/main/java/apoc/ApocExtensionFactory.java b/common/src/main/java/apoc/ApocExtensionFactory.java
index 4359ef4cc..74488e022 100644
--- a/common/src/main/java/apoc/ApocExtensionFactory.java
+++ b/common/src/main/java/apoc/ApocExtensionFactory.java
@@ -147,6 +147,10 @@ public void stop() {
                     }
                 });
             });
+
+            AvailabilityGuard availabilityGuard = dependencies.availabilityGuard();
+            registeredListeners.forEach(availabilityGuard::removeListener);
+            registeredListeners.clear();
         }
 
         public Collection<AvailabilityListener> getRegisteredListeners()