diff --git a/application/src/main/java/com/indiscale/fdo/manager/service/fdo/FDOApiImpl.java b/application/src/main/java/com/indiscale/fdo/manager/service/fdo/FDOApiImpl.java
index de139a03e7b685b761a2c4d12c986f2adbe30ab1..65df4fb8e4ba1f0f909bbf7d8e2e63f98273b4ad 100644
--- a/application/src/main/java/com/indiscale/fdo/manager/service/fdo/FDOApiImpl.java
+++ b/application/src/main/java/com/indiscale/fdo/manager/service/fdo/FDOApiImpl.java
@@ -86,7 +86,9 @@ public class FDOApiImpl extends BaseController implements FdoApi {
     try (Manager manager = getManager()) {
       RepositoryConnection repository =
           manager.getRepositoryRegistry().createRepositoryConnection(repositories.getFdo());
-      repository.setTokenAuthenticationInfo(new TokenAuthenticationInfo(getToken()));
+      if (getToken() != null && !getToken().isBlank()) {
+        repository.setTokenAuthenticationInfo(new TokenAuthenticationInfo(getToken()));
+      }
       FdoProfile profile = manager.getDefaultProfile();
       FDO fdo =
           manager.createFDO(