diff --git a/search-services/alfresco-solr/src/main/resources/solr/instance/templates/lsh/conf/solrconfig.xml b/search-services/alfresco-solr/src/main/resources/solr/instance/templates/lsh/conf/solrconfig.xml
index 0f8457ed2..3dd8f1cf7 100644
--- a/search-services/alfresco-solr/src/main/resources/solr/instance/templates/lsh/conf/solrconfig.xml
+++ b/search-services/alfresco-solr/src/main/resources/solr/instance/templates/lsh/conf/solrconfig.xml
@@ -834,7 +834,6 @@
     </lst>
     <arr name="components">
       <str>setLocale</str>
-      <str>ensureModels</str>
       <str>rewriteFacetParameters</str>
       <str>query</str>
       <str>facet</str>
@@ -864,7 +863,6 @@
 
    <arr name="components">
       <str>setLocale</str>
-      <str>ensureModels</str>
       <str>rewriteFacetParameters</str>
       <str>query</str>
       <str>facet</str>
@@ -1796,7 +1794,6 @@
     </lst>
     <arr name="components">
       <str>setLocale</str>
-      <str>ensureModels</str>
       <str>rewriteFacetParameters</str>
       <str>query</str>
       <str>facet</str>
@@ -1839,7 +1836,6 @@
     </lst>
     <arr name="components">
       <str>setLocale</str>
-      <str>ensureModels</str>
       <str>rewriteFacetParameters</str>
       <str>query</str>
       <str>facet</str>
@@ -1864,7 +1860,6 @@
     </lst>
     <arr name="components">
       <str>setLocale</str>
-      <str>ensureModels</str>
       <str>rewriteFacetParameters</str>
       <str>query</str>
       <str>facet</str>
@@ -1901,7 +1896,6 @@
   </queryParser>
 
   <searchComponent name="setLocale"     class="org.alfresco.solr.component.SetLocaleComponent" />
-  <searchComponent name="ensureModels" class="org.alfresco.solr.component.EnsureModelsComponent" />
   <searchComponent name="clearLocale"   class="org.alfresco.solr.component.ClearLocaleComponent" />
   <searchComponent name="rewriteFacetParameters"     class="org.alfresco.solr.component.RewriteFacetParametersComponent" />
   <searchComponent name="rewriteFacetCounts"     class="org.alfresco.solr.component.RewriteFacetCountsComponent" />
diff --git a/search-services/alfresco-solr/src/main/resources/solr/instance/templates/rerank/conf/solrconfig.xml b/search-services/alfresco-solr/src/main/resources/solr/instance/templates/rerank/conf/solrconfig.xml
index 7758497ee..7e2e0e868 100644
--- a/search-services/alfresco-solr/src/main/resources/solr/instance/templates/rerank/conf/solrconfig.xml
+++ b/search-services/alfresco-solr/src/main/resources/solr/instance/templates/rerank/conf/solrconfig.xml
@@ -834,7 +834,6 @@
     </lst>
     <arr name="components">
       <str>setLocale</str>
-      <str>ensureModels</str>
       <str>rewriteFacetParameters</str>
       <str>query</str>
       <str>facet</str>
@@ -864,7 +863,6 @@
 
    <arr name="components">
       <str>setLocale</str>
-      <str>ensureModels</str>
       <str>rewriteFacetParameters</str>
       <str>query</str>
       <str>facet</str>
@@ -1796,7 +1794,6 @@
     </lst>
     <arr name="components">
       <str>setLocale</str>
-      <str>ensureModels</str>
       <str>rewriteFacetParameters</str>
       <str>query</str>
       <str>facet</str>
@@ -1839,7 +1836,6 @@
     </lst>
     <arr name="components">
       <str>setLocale</str>
-      <str>ensureModels</str>
       <str>rewriteFacetParameters</str>
       <str>query</str>
       <str>facet</str>
@@ -1864,7 +1860,6 @@
     </lst>
     <arr name="components">
       <str>setLocale</str>
-      <str>ensureModels</str>
       <str>rewriteFacetParameters</str>
       <str>query</str>
       <str>facet</str>
@@ -1901,7 +1896,6 @@
   </queryParser>
 
   <searchComponent name="setLocale"     class="org.alfresco.solr.component.SetLocaleComponent" />
-  <searchComponent name="ensureModels" class="org.alfresco.solr.component.EnsureModelsComponent" />
   <searchComponent name="clearLocale"   class="org.alfresco.solr.component.ClearLocaleComponent" />
   <searchComponent name="rewriteFacetParameters"     class="org.alfresco.solr.component.RewriteFacetParametersComponent" />
   <searchComponent name="rewriteFacetCounts"     class="org.alfresco.solr.component.RewriteFacetCountsComponent" />