diff --git a/config/alfresco/cache-context.xml b/config/alfresco/cache-context.xml
index ca93c2c3c0..dbcbe10726 100644
--- a/config/alfresco/cache-context.xml
+++ b/config/alfresco/cache-context.xml
@@ -6,6 +6,12 @@
    are defined in tx-cache-context.xml
 -->
 <beans>
+   <!--
+    TEMP: This doesn't strictly belong here, but must be loaded before the enterprise/cluster/cluster-context.xml
+    file is imported (so that it overrides this bean correctly.
+    -->
+   <bean id="webdavLockStoreFactory" class="org.alfresco.repo.webdav.SimpleLockStoreFactory"/>
+
    <!-- ===================================== -->
    <!-- Property Values Cache                 -->
    <!-- ===================================== -->
diff --git a/config/alfresco/webdav-context.xml b/config/alfresco/webdav-context.xml
index 3a721d3fac..a418000cc3 100644
--- a/config/alfresco/webdav-context.xml
+++ b/config/alfresco/webdav-context.xml
@@ -24,8 +24,6 @@
         <property name="enabled"><value>${system.webdav.servlet.enabled}</value></property>
         <property name="activitiesEnabled" value="${system.webdav.activities.enabled}"/>
     </bean>
-    
-    <bean id="webdavLockStoreFactory" class="org.alfresco.repo.webdav.SimpleLockStoreFactory"/>
 
     <!-- Configure remote-api source related beans in remote-api-context.xml to ensure no dependency problems -->
 </beans>
\ No newline at end of file