diff --git a/gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/rest/api/service/impl/ApplicationServiceImpl.java b/gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/rest/api/service/impl/ApplicationServiceImpl.java
index 1a29eb240ad..71acb045d11 100644
--- a/gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/rest/api/service/impl/ApplicationServiceImpl.java
+++ b/gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/rest/api/service/impl/ApplicationServiceImpl.java
@@ -482,7 +482,7 @@ public ApplicationEntity create(final ExecutionContext executionContext, NewAppl
         }
 
         Application application = applicationConverter.toApplication(newApplicationEntity);
-        if (newApplicationEntity.getId() != null) {
+        if (newApplicationEntity.getId() != null && !newApplicationEntity.getId().isEmpty()) {
             application.setId(newApplicationEntity.getId());
         } else {
             application.setId(UuidString.generateRandom());