diff --git a/source/java/org/alfresco/repo/web/scripts/RepositoryContainer.java b/source/java/org/alfresco/repo/web/scripts/RepositoryContainer.java
index 4443831220..3ba1a2de7e 100644
--- a/source/java/org/alfresco/repo/web/scripts/RepositoryContainer.java
+++ b/source/java/org/alfresco/repo/web/scripts/RepositoryContainer.java
@@ -462,8 +462,9 @@ public class RepositoryContainer extends AbstractRuntimeContainer implements Ten
         Registry registry = webScriptsRegistryCache.get(tenantDomain);
         if (registry == null)
         {
-            init();
-            registry = webScriptsRegistryCache.get(tenantDomain);
+            registry = (Registry)registryFactory.getObject();
+            registry.reset();
+            webScriptsRegistryCache.put(tenantDomain, registry);
         }
         return registry;
     }
@@ -556,9 +557,6 @@ public class RepositoryContainer extends AbstractRuntimeContainer implements Ten
     {
         tenantAdminService.register(this);
         
-        Registry registry = (Registry)registryFactory.getObject();
-        webScriptsRegistryCache.put(tenantAdminService.getCurrentUserDomain(), registry);
-        
         super.reset();
     }