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 81a999998bb4e81f50eed729608a4c339467fbfe..08c5f7ec8ea0d7fb181b79e3df92f34a688d2b0e 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
@@ -389,7 +389,7 @@ public class ServiceForDataStoreServer extends AbstractCommonServer<IServiceForD
         if (dataStore == null)
         {
             dataStore = new DataStorePE();
-            dataStore.setDatabaseInstanceUUID(UUID.randomUUID().toString().toUpperCase());
+            dataStore.setDatabaseInstanceUUID(getDatabaseInstanceUUID());
         }
         dataStore.setCode(info.getDataStoreCode());
         dataStore.setDownloadUrl(info.getDownloadUrl());