diff --git a/hawkbit-runtime/hawkbit-mgmt-server/src/main/resources/application.properties b/hawkbit-runtime/hawkbit-mgmt-server/src/main/resources/application.properties
index d8db19146..61101a00e 100644
--- a/hawkbit-runtime/hawkbit-mgmt-server/src/main/resources/application.properties
+++ b/hawkbit-runtime/hawkbit-mgmt-server/src/main/resources/application.properties
@@ -16,6 +16,9 @@ spring.security.user.name=admin
 spring.security.user.password={noop}admin
 spring.main.allow-bean-definition-overriding=true
 
+# allow to auto create DEFAULT tenant (on mgmt api call)
+hawkbit.server.repository.implicitTenantCreateAllowed=true
+
 # Http Encoding
 server.servlet.encoding.charset=UTF-8
 server.servlet.encoding.enabled=true
diff --git a/hawkbit-runtime/hawkbit-update-server/src/main/resources/application.properties b/hawkbit-runtime/hawkbit-update-server/src/main/resources/application.properties
index 3591b8b07..ec44c4f18 100644
--- a/hawkbit-runtime/hawkbit-update-server/src/main/resources/application.properties
+++ b/hawkbit-runtime/hawkbit-update-server/src/main/resources/application.properties
@@ -12,6 +12,8 @@
 spring.security.user.name=admin
 spring.security.user.password={noop}admin
 spring.main.allow-bean-definition-overriding=true
+# allow to auto create DEFAULT tenant (on mgmt api call)
+hawkbit.server.repository.implicitTenantCreateAllowed=true
 
 # Http Encoding
 server.servlet.encoding.charset=UTF-8