diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServer.java
index 6b321c315076712805afe3d04ecdd315b4a3ddd8..f4b75d9f0b21f16a995ad2e27eabeb0400ab4ec2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServer.java
@@ -3085,7 +3085,9 @@ public class ServiceForDataStoreServer extends AbstractCommonServer<IServiceForD
         }
     }
 
-    public void setTimeout(long timeout) {
-        this.timeout = timeout;
+    public void setTimeout(String timeout) {
+        try {
+            this.timeout = Long.parseLong(timeout);
+        } catch (Exception e) {}
     }    
 }