diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/AfsRegistrator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/AfsRegistrator.java
index fff034c4d26436e54c84244cdfdae6d75b4353a3..b0d3ff806f478ff26aeb72da3f31d638c3846e44 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/AfsRegistrator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/AfsRegistrator.java
@@ -1,7 +1,5 @@
 package ch.systemsx.cisd.openbis.generic.server;
 
-import javax.annotation.Resource;
-
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEvent;
@@ -14,7 +12,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
-import ch.systemsx.cisd.common.spring.ExposablePropertyPlaceholderConfigurer;
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDataStoreDAO;
 import ch.systemsx.cisd.openbis.generic.shared.dto.DataStorePE;
@@ -27,14 +24,9 @@ public class AfsRegistrator implements IAfsRegistrator, ApplicationListener<Appl
 
     private static final String AFS_DATA_STORE_CODE = "AFS";
 
-    private static final String AFS_URL_PROPERTY_NAME = ComponentNames.SERVER_PUBLIC_INFORMATION + "afs-server.url";
-
     @Autowired
     private IDAOFactory daoFactory;
 
-    @Resource(name = ExposablePropertyPlaceholderConfigurer.PROPERTY_CONFIGURER_BEAN_NAME)
-    private ExposablePropertyPlaceholderConfigurer configurer;
-
     @Autowired IAfsRegistrator self;
 
     private boolean registered;
@@ -75,12 +67,10 @@ public class AfsRegistrator implements IAfsRegistrator, ApplicationListener<Appl
             return;
         }
 
-        String afsUrl = configurer.getResolvedProps().getProperty(AFS_URL_PROPERTY_NAME, "");
-
         DataStorePE dataStore = new DataStorePE();
         dataStore.setCode(AFS_DATA_STORE_CODE);
-        dataStore.setDownloadUrl(afsUrl);
-        dataStore.setRemoteUrl(afsUrl);
+        dataStore.setDownloadUrl("");
+        dataStore.setRemoteUrl("");
         dataStore.setDatabaseInstanceUUID("");
         dataStore.setSessionToken("");
         dataStore.setArchiverConfigured(false);