diff --git a/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java
index 04ad975..a62efd3 100644
--- a/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java
@@ -656,6 +656,12 @@ public class RepositoryServiceImpl implements RepositoryService {
                                                          String desiredCompatibilityLevel) throws Exception {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         Repository repository = this.getRepositoryById(repoId);
+        if (repositoryInterface.getId() != null) {
+            RepositoryInterface existing = getRepositoryInterface(repoId).stream().filter(iFace -> iFace.getId().equals(repositoryInterface.getId())).findFirst().orElse(null);
+            if (existing != null && (existing.getBaseurl() == null || "".equals(existing.getBaseurl()))) {
+                this.updateBaseUrl(repoId, repositoryInterface.getId(), repositoryInterface.getBaseurl());
+            }
+        }
 
         this.updateValidationSet(repoId, repositoryInterface.getId(), repositoryInterface.getAccessSet());