diff --git a/openidm-security/src/main/java/org/forgerock/openidm/security/SecurityManager.java b/openidm-security/src/main/java/org/forgerock/openidm/security/SecurityManager.java
index cfc018d277..9cb24f12b4 100644
--- a/openidm-security/src/main/java/org/forgerock/openidm/security/SecurityManager.java
+++ b/openidm-security/src/main/java/org/forgerock/openidm/security/SecurityManager.java
@@ -54,6 +54,7 @@
 import org.osgi.service.component.annotations.ConfigurationPolicy;
 import org.osgi.service.component.annotations.Deactivate;
 import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferencePolicy;
 import org.osgi.service.component.propertytypes.ServiceDescription;
 import org.osgi.service.component.propertytypes.ServiceVendor;
 import org.slf4j.Logger;
@@ -82,8 +83,8 @@ public class SecurityManager implements RequestHandler {
      */
     private final static Logger logger = LoggerFactory.getLogger(SecurityManager.class);
     
-    @Reference
-    protected RepositoryService repoService;
+    @Reference(policy = ReferencePolicy.DYNAMIC)
+    protected volatile RepositoryService repoService;
 
     @Reference
     private CryptoService cryptoService;