diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml
index 9a9e0d0a5a..57e98b97de 100644
--- a/config/alfresco/core-services-context.xml
+++ b/config/alfresco/core-services-context.xml
@@ -491,7 +491,7 @@
             <ref bean="nodeService" />
         </property>
         <property name="contentService">
-            <ref bean="ContentService"/>
+            <ref bean="contentService"/>
         </property>
         <property name="resourceBundleBaseNamesCache">
             <ref bean="resourceBundleBaseNamesCache"/>
@@ -744,7 +744,7 @@
                 <property name="targetSource">
                     <bean class="org.alfresco.config.NonBlockingLazyInitTargetSource">
                         <property name="targetBeanName">
-                            <idref bean="messageService" />
+                            <idref bean="MessageService" />
                         </property>
                     </bean>
                 </property> 
diff --git a/config/alfresco/public-services-context.xml b/config/alfresco/public-services-context.xml
index 4a6cc76771..ef94ea8b47 100644
--- a/config/alfresco/public-services-context.xml
+++ b/config/alfresco/public-services-context.xml
@@ -1537,4 +1537,34 @@
             </props>
         </property>
     </bean>
+
+    <bean id="MessageService" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <list>
+                <value>org.alfresco.repo.i18n.MessageService</value>
+            </list>
+        </property>
+        <property name="target">
+            <ref bean="messageService"/>
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref local="MessageService_transaction"/>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="MessageService_transaction" class="org.alfresco.repo.transaction.RetryingTransactionInterceptor">
+        <property name="transactionService">
+            <ref bean="TransactionService"/>
+        </property>
+        <property name="transactionManager">
+            <ref bean="transactionManager"/>
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="getMessage">${server.transaction.mode.readOnly}</prop>
+            </props>
+        </property>
+    </bean>
 </beans>