diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/HashLoginService.java b/jetty-security/src/main/java/org/eclipse/jetty/security/HashLoginService.java
index 108ca0a..ae5efe4 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/HashLoginService.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/HashLoginService.java
@@ -199,5 +199,8 @@
     protected void doStop() throws Exception
     {
         super.doStop();
+        if (_propertyUserStore != null)
+            _propertyUserStore.stop();
+        _propertyUserStore = null;
     }
 }