diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/cache/TenantAwareCacheManager.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/cache/TenantAwareCacheManager.java
index 06d6e1719..435f1b2e1 100644
--- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/cache/TenantAwareCacheManager.java
+++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/cache/TenantAwareCacheManager.java
@@ -51,7 +51,12 @@ public class TenantAwareCacheManager implements TenancyCacheManager {
 
     @Override
     public Cache getCache(final String name) {
-        final String currentTenant = tenantAware.getCurrentTenant().toUpperCase();
+        String currentTenant = tenantAware.getCurrentTenant();
+        if (currentTenant == null) {
+            return null;
+        }
+
+        currentTenant = currentTenant.toUpperCase();
         if (currentTenant.contains(TENANT_CACHE_DELIMITER)) {
             return null;
         }
@@ -60,7 +65,12 @@ public class TenantAwareCacheManager implements TenancyCacheManager {
 
     @Override
     public Collection<String> getCacheNames() {
-        final String currentTenant = tenantAware.getCurrentTenant().toUpperCase();
+        String currentTenant = tenantAware.getCurrentTenant();
+        if (currentTenant == null) {
+            return null;
+        }
+
+        currentTenant = currentTenant.toUpperCase();
         if (currentTenant.contains(TENANT_CACHE_DELIMITER)) {
             return Collections.emptyList();
         }
diff --git a/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpConfiguration.java b/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpConfiguration.java
index 7ad557717..42b91e89b 100644
--- a/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpConfiguration.java
+++ b/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpConfiguration.java
@@ -23,6 +23,7 @@ import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
 import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
 import org.springframework.amqp.support.converter.MessageConverter;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 
@@ -134,6 +135,7 @@ public class AmqpConfiguration {
      * @return
      */
     @Bean
+    @ConditionalOnMissingBean
     public AmqpSenderService amqpSenderServiceBean() {
         return new DefaultAmqpSenderService(rabbitTemplate);
     }
diff --git a/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/BaseAmqpService.java b/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/BaseAmqpService.java
index 8371a0586..adc5b43f6 100644
--- a/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/BaseAmqpService.java
+++ b/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/BaseAmqpService.java
@@ -7,7 +7,6 @@ import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.amqp.support.converter.AbstractJavaTypeMapper;
 import org.springframework.amqp.support.converter.MessageConverter;
-import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * @author Dennis Melzer
@@ -21,7 +20,6 @@ public class BaseAmqpService {
 
     protected RabbitTemplate spInternalConnectorTemplate;
 
-    @Autowired
     public BaseAmqpService(final MessageConverter messageConverter, final RabbitTemplate defaultTemplate) {
         this.messageConverter = messageConverter;
         spInternalConnectorTemplate = defaultTemplate;
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 2ddbfe870..e19f08b4e 100644
--- a/hawkbit-repository/src/main/java/org/eclipse/hawkbit/MultiTenantJpaTransactionManager.java
+++ b/hawkbit-repository/src/main/java/org/eclipse/hawkbit/MultiTenantJpaTransactionManager.java
@@ -48,7 +48,9 @@ public class MultiTenantJpaTransactionManager extends JpaTransactionManager {
                 && !definition.getName().startsWith(SystemManagement.class.getCanonicalName() + ".deleteTenant")
                 && !definition.getName()
                         .startsWith(SystemManagement.class.getCanonicalName() + ".currentTenantKeyGenerator")
-                && !definition.getName().startsWith(RolloutManagement.class.getCanonicalName() + ".rolloutScheduler")) {
+                && !definition.getName().startsWith(RolloutManagement.class.getCanonicalName() + ".rolloutScheduler")
+                && !definition.getName()
+                        .startsWith(SystemManagement.class.getCanonicalName() + ".getOrCreateTenantMetadata")) {
 
             final String currentTenant = tenantAware.getCurrentTenant();
             if (currentTenant == null) {