diff --git a/hawkbit-repository/src/main/java/org/eclipse/hawkbit/MultiTenantJpaTransactionManager.java b/hawkbit-repository/src/main/java/org/eclipse/hawkbit/MultiTenantJpaTransactionManager.java
index 1a519ea5b..ac6bc8806 100644
--- a/hawkbit-repository/src/main/java/org/eclipse/hawkbit/MultiTenantJpaTransactionManager.java
+++ b/hawkbit-repository/src/main/java/org/eclipse/hawkbit/MultiTenantJpaTransactionManager.java
@@ -38,7 +38,7 @@ public class MultiTenantJpaTransactionManager extends JpaTransactionManager {
         super.doBegin(transaction, definition);
 
         // ignore transactions on tenant independent calls
-        if (isTenantManagement(definition) && isCurrentTenantKeyGenerator(definition)) {
+        if (isTenantManagement(definition) || isCurrentTenantKeyGenerator(definition)) {
             return;
         }