diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml
index 1c24f1c28c..11c602c809 100644
--- a/config/alfresco/core-services-context.xml
+++ b/config/alfresco/core-services-context.xml
@@ -1121,7 +1121,7 @@
         </property>
     </bean>
     
-    <bean id="noindex" class="org.alfresco.repo.management.subsystems.ChildApplicationContextFactory" parent="abstractPropertyBackedBean">
+    <bean id="noindex" class="org.alfresco.repo.management.subsystems.NoIndexChildApplicationContextFactory" parent="abstractPropertyBackedBean">
         <property name="autoStart">
             <value>false</value>
         </property>
diff --git a/source/java/org/alfresco/repo/management/subsystems/AbstractPropertyBackedBean.java b/source/java/org/alfresco/repo/management/subsystems/AbstractPropertyBackedBean.java
index 29c2465f49..0201c9ca91 100644
--- a/source/java/org/alfresco/repo/management/subsystems/AbstractPropertyBackedBean.java
+++ b/source/java/org/alfresco/repo/management/subsystems/AbstractPropertyBackedBean.java
@@ -91,9 +91,9 @@ public abstract class AbstractPropertyBackedBean implements PropertyBackedBean,
     private DefaultResolver defaultResolver = new DefaultResolver();
 
     /** The lifecycle states. */
-    private enum RuntimeState {UNINITIALIZED, STOPPED, PENDING_BROADCAST_START, STARTED};
+    protected enum RuntimeState {UNINITIALIZED, STOPPED, PENDING_BROADCAST_START, STARTED};
     
-    private RuntimeState runtimeState = RuntimeState.UNINITIALIZED;
+    protected RuntimeState runtimeState = RuntimeState.UNINITIALIZED;
 
     /** The state. */
     private PropertyBackedBeanState state;
diff --git a/source/java/org/alfresco/repo/management/subsystems/LuceneChildApplicationContextFactory.java b/source/java/org/alfresco/repo/management/subsystems/LuceneChildApplicationContextFactory.java
index 38eedca811..a179257487 100644
--- a/source/java/org/alfresco/repo/management/subsystems/LuceneChildApplicationContextFactory.java
+++ b/source/java/org/alfresco/repo/management/subsystems/LuceneChildApplicationContextFactory.java
@@ -35,6 +35,12 @@ public class LuceneChildApplicationContextFactory extends ChildApplicationContex
     {
         return new ApplicationContextState(true);
     }
+    
+    protected void destroy(boolean isPermanent)
+    {
+        super.destroy(isPermanent);
+        doInit();
+    }
 
     
 }
diff --git a/source/java/org/alfresco/repo/management/subsystems/NoIndexChildApplicationContextFactory.java b/source/java/org/alfresco/repo/management/subsystems/NoIndexChildApplicationContextFactory.java
new file mode 100644
index 0000000000..4ca0844d53
--- /dev/null
+++ b/source/java/org/alfresco/repo/management/subsystems/NoIndexChildApplicationContextFactory.java
@@ -0,0 +1,10 @@
+package org.alfresco.repo.management.subsystems;
+
+public class NoIndexChildApplicationContextFactory extends ChildApplicationContextFactory
+{
+    protected void destroy(boolean isPermanent)
+    {
+        super.destroy(isPermanent);
+        doInit();
+    }
+}
diff --git a/source/java/org/alfresco/repo/search/impl/solr/SolrChildApplicationContextFactory.java b/source/java/org/alfresco/repo/search/impl/solr/SolrChildApplicationContextFactory.java
index 04ccbce98d..1df8edab2f 100644
--- a/source/java/org/alfresco/repo/search/impl/solr/SolrChildApplicationContextFactory.java
+++ b/source/java/org/alfresco/repo/search/impl/solr/SolrChildApplicationContextFactory.java
@@ -328,5 +328,11 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF
             throw new IllegalStateException("Illegal write to property \"" + name + "\"");
         }
         super.setProperty(name, value);
-    }    
+    }  
+    
+    protected void destroy(boolean isPermanent)
+    {
+        super.destroy(isPermanent);
+        doInit();
+    }
 }