diff --git a/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/SystemManagement.java b/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/SystemManagement.java
index c1cee7223..be370cf2d 100644
--- a/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/SystemManagement.java
+++ b/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/SystemManagement.java
@@ -164,7 +164,7 @@ public class SystemManagement {
      * @return the {@link CurrentTenantKeyGenerator}
      */
     @Bean
-    @Transactional(propagation = Propagation.NOT_SUPPORTED)
+    @Transactional(propagation = Propagation.SUPPORTS)
     public CurrentTenantKeyGenerator currentTenantKeyGenerator() {
         return new CurrentTenantKeyGenerator();
     }