diff --git a/config/alfresco/subsystems/Search/noindex/noindex-search-context.xml b/config/alfresco/subsystems/Search/noindex/noindex-search-context.xml
index e6c3a9fedc..8b866e587d 100644
--- a/config/alfresco/subsystems/Search/noindex/noindex-search-context.xml
+++ b/config/alfresco/subsystems/Search/noindex/noindex-search-context.xml
@@ -129,6 +129,16 @@
             <value>solr-cmis</value>
         </property>
     </bean>
-    
+
+    <bean id="search.cmis.alfresco.index1.1" class="org.alfresco.repo.search.impl.solr.NoIndexQueryLanguage"  >
+        <property name="factories">
+            <list>
+                <ref bean="search.indexerAndSearcherFactory" />
+            </list>
+        </property>
+        <property name="name">
+            <value>solr-cmis</value>
+        </property>
+    </bean>    
 	
 </beans>
diff --git a/config/alfresco/subsystems/Search/noindex/opencmis-context.xml b/config/alfresco/subsystems/Search/noindex/opencmis-context.xml
index 8d37a3487a..f5daaf252b 100644
--- a/config/alfresco/subsystems/Search/noindex/opencmis-context.xml
+++ b/config/alfresco/subsystems/Search/noindex/opencmis-context.xml
@@ -16,4 +16,17 @@
             <ref bean="dictionaryService" />
         </property>
     </bean>
+
+   <bean id="search.OpenCMISQueryService1.1" class="org.alfresco.repo.search.impl.noindex.NoIndexOpenCMISQueryServiceImpl" >
+       <property name="cmisDictionaryService">
+            <ref bean="OpenCMISDictionaryService1.1" />
+        </property>
+        <property name="nodeService">
+            <ref bean="nodeService" />
+        </property>
+        <property name="alfrescoDictionaryService">
+            <ref bean="dictionaryService" />
+        </property>
+    </bean>
+
 </beans>
\ No newline at end of file