diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java
index edc238045dfd5adf806b6c92cec1dae501ac45b4..d410df32ec4c30aff6ee4d78bd6e6a3991814651 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java
@@ -19,7 +19,6 @@ package ch.systemsx.cisd.openbis.dss.generic.server;
 import static ch.systemsx.cisd.openbis.generic.shared.GenericSharedConstants.DATA_STORE_SERVER_SERVICE_NAME;
 import static ch.systemsx.cisd.openbis.generic.shared.GenericSharedConstants.DATA_STORE_SERVER_WEB_APPLICATION_NAME;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.Enumeration;
 import java.util.Properties;
@@ -101,8 +100,6 @@ public class DataStoreServer
 
     private static final int PREFIX_LENGTH = PREFIX.length();
 
-    private static final String SERVICE_PROPERTIES_FILE = "etc/service.properties";
-
     private static final Logger operationLog =
             LogFactory.getLogger(LogCategory.OPERATION, DataStoreServer.class);
 
@@ -199,13 +196,13 @@ public class DataStoreServer
 
     final static ConfigParameters getConfigParameters()
     {
-        final Properties properties;
-        if (new File(SERVICE_PROPERTIES_FILE).exists() == false)
+        Properties properties;
+        try
         {
-            properties = new Properties();
-        } else
+            properties = PropertyParametersUtil.loadServiceProperties();
+        } catch (ConfigurationFailureException ex)
         {
-            properties = PropertyParametersUtil.loadProperties(SERVICE_PROPERTIES_FILE);
+            properties = new Properties();
         }
         final Properties systemProperties = System.getProperties();
         final Enumeration<?> propertyNames = systemProperties.propertyNames();