diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index ef7e5c743..fe08376dd 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,9 +1,11 @@
 spring.profiles.active=@spring.profiles.active@
+spring.main.allow-bean-definition-overriding=true
 
 server.compression.enabled=true
 server.compression.mime-types=application/json,application/xml,text/html,text/xml,text/plain,application/javascript,text/css
 security.basic.enabled=false
 server.tomcat.uri-encoding=UTF-8
+
 spring.jackson.serialization.write_dates_as_timestamps=false
 # Comment out if using anything else than H2 (e.g. MySQL or PostgreSQL)
 spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
@@ -19,3 +21,4 @@ logging.level.org.atmosphere = warn
 
 # Ensure application is run in Vaadin 14/npm mode
 vaadin.compatibilityMode = false
+