diff --git a/src/main/java/org/olat/search/_spring/searchJms_jndi.xml b/src/main/java/org/olat/search/_spring/searchJms_jndi.xml
index 58e8825f843514001ae8973b3ee2972cf906cf14..e04d268253988eb8edb0171c76b3e9abca96ed51 100644
--- a/src/main/java/org/olat/search/_spring/searchJms_jndi.xml
+++ b/src/main/java/org/olat/search/_spring/searchJms_jndi.xml
@@ -11,4 +11,11 @@
     <bean id="searchQueue" class="org.springframework.jndi.JndiObjectFactoryBean" lazy-init="true">
 		<property name="jndiName"><value>${search.broker.jndi}</value></property>
 	</bean>
+	
+	<bean id="indexConnectionFactory" class="org.springframework.jndi.JndiObjectFactoryBean" lazy-init="true">
+        <property name="jndiName"><value>${jms.broker.jndi}</value></property>
+    </bean>
+    <bean id="indexQueue" class="org.springframework.jndi.JndiObjectFactoryBean" lazy-init="true">
+		<property name="jndiName"><value>${index.broker.jndi}</value></property>
+	</bean>
 </beans>
diff --git a/src/main/resources/serviceconfig/olat.properties b/src/main/resources/serviceconfig/olat.properties
index 2d3acc6bb3ac84e93bb5b42030f9557e5e49547a..dfbdfc9b8242bd3fe692bba26d3bd40c371981f6 100644
--- a/src/main/resources/serviceconfig/olat.properties
+++ b/src/main/resources/serviceconfig/olat.properties
@@ -649,6 +649,7 @@ codepoint.jms.broker.url=vm://embedded?broker.persistent=false
 jms.broker.jndi=OpenOLATConnectionFactory
 sysbus.broker.jndi=topic/sysbus
 search.broker.jndi=queue/searchQueue
+index.broker.jndi=queue/indexQueue
 
 
 # enable/disable codepoint/breakpoint framework