diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServiceServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServiceServer.java
index cc1f0ff153c986bc311c224015701ecaf188aedf..7f51e5203e51ef6aecf782a2cfa1238098e8665c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServiceServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServiceServer.java
@@ -41,8 +41,6 @@ public class CommonServiceServer extends HttpInvokerServiceExporter
     {
         setServiceInterface(ICommonServer.class);
         setService(common);
-        setInterceptors(new Object[]
-            { new OptimisticLockingRetryAdvisor() });
         super.afterPropertiesSet();
     }
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceServer.java
index 67d88060cad3fbfa8e1c774f98723c19cb2e9427..84d3298065b7faf0bffc0b00972862d981ea3284 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceServer.java
@@ -47,7 +47,7 @@ public class ETLServiceServer extends HttpInvokerServiceExporter
         setServiceInterface(IServiceForDataStoreServer.class);
         setService(etlService);
         setInterceptors(new Object[]
-            { createExceptionTranslator(), new OptimisticLockingRetryAdvisor() });
+            { createExceptionTranslator() });
         super.afterPropertiesSet();
     }
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationServerManager.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationServerManager.java
index f8b8efc2797d4a50c7f43692bec872d3910baa4a..1b2648007fea8a45dbd572e599d60357fb33f668 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationServerManager.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationServerManager.java
@@ -74,7 +74,6 @@ public class ServiceConversationServerManager extends BaseServiceConversationSer
     public void setEtlService(IServiceForDataStoreServer etlService)
     {
         ProxyFactory factory = new ProxyFactory(etlService);
-        factory.addAdvisor(new OptimisticLockingRetryAdvisor());
         this.etlService = (IServiceForDataStoreServer) factory.getProxy();
     }
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServiceServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServiceServer.java
index 4a162bd1c52f9a0f2358337887c80f6f629a6eb8..0616d80252130234f7be4fa5579c53db205391c7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServiceServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServiceServer.java
@@ -22,7 +22,6 @@ import org.springframework.remoting.httpinvoker.HttpInvokerServiceExporter;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import ch.systemsx.cisd.openbis.generic.server.OptimisticLockingRetryAdvisor;
 import ch.systemsx.cisd.openbis.plugin.generic.shared.IGenericServer;
 import ch.systemsx.cisd.openbis.plugin.generic.shared.ResourceNames;
 
@@ -42,8 +41,6 @@ public class GenericServiceServer extends HttpInvokerServiceExporter
     {
         setServiceInterface(IGenericServer.class);
         setService(server);
-        setInterceptors(new Object[]
-            { new OptimisticLockingRetryAdvisor() });
         super.afterPropertiesSet();
     }