diff --git a/examples/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/amqp/SenderService.java b/examples/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/amqp/SenderService.java
index 6f16ac736..f2c0e7fcb 100644
--- a/examples/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/amqp/SenderService.java
+++ b/examples/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/amqp/SenderService.java
@@ -58,6 +58,7 @@ public abstract class SenderService extends MessageService {
         }
         message.getMessageProperties().getHeaders().remove(AbstractJavaTypeMapper.DEFAULT_CLASSID_FIELD_NAME);
         final String correlationId = UUID.randomUUID().toString();
+        message.getMessageProperties().setCorrelationId(correlationId.getBytes());
 
         if (LOGGER.isTraceEnabled()) {
             LOGGER.trace("Sending message {} to exchange {} with correlationId {}", message, address, correlationId);
diff --git a/examples/hawkbit-example-mgmt-simulator/src/main/resources/application.properties b/examples/hawkbit-example-mgmt-simulator/src/main/resources/application.properties
index ac3f240a3..747e8ffe9 100644
--- a/examples/hawkbit-example-mgmt-simulator/src/main/resources/application.properties
+++ b/examples/hawkbit-example-mgmt-simulator/src/main/resources/application.properties
@@ -13,7 +13,7 @@ hawkbit.password=admin
 
 spring.main.show-banner=false
 
-hawkbit.scenarios.[0].cleanRepository=true
+hawkbit.scenarios.[0].cleanRepository=false
 hawkbit.scenarios.[0].targets=0
 hawkbit.scenarios.[0].ds-name=gettingstarted-example
 hawkbit.scenarios.[0].distribution-sets=3
diff --git a/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerService.java b/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerService.java
index 73f9e14df..3f42c2937 100644
--- a/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerService.java
+++ b/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerService.java
@@ -70,7 +70,6 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.context.SecurityContextImpl;
 import org.springframework.web.util.UriComponentsBuilder;
 
-import com.google.common.base.Strings;
 import com.google.common.eventbus.EventBus;
 
 /**
@@ -348,9 +347,9 @@ public class AmqpMessageHandlerService extends BaseAmqpService {
         final ActionStatus actionStatus = entityFactory.generateActionStatus();
         actionUpdateStatus.getMessage().forEach(actionStatus::addMessage);
 
-        if (!Strings.isNullOrEmpty(message.getMessageProperties().getCorrelationIdString())) {
+        if (message.getMessageProperties().getCorrelationId().length > 0) {
             actionStatus.addMessage(RepositoryConstants.SERVER_MESSAGE_PREFIX + "DMF message correlation-id "
-                    + message.getMessageProperties().getCorrelationIdString());
+                    + message.getMessageProperties().getCorrelationId());
         }
 
         actionStatus.setAction(action);
diff --git a/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/DefaultAmqpSenderService.java b/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/DefaultAmqpSenderService.java
index afb3e7ff2..d951cce5d 100644
--- a/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/DefaultAmqpSenderService.java
+++ b/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/DefaultAmqpSenderService.java
@@ -46,6 +46,7 @@ public class DefaultAmqpSenderService implements AmqpSenderService {
 
         final String correlationId = UUID.randomUUID().toString();
         final String exchange = extractExchange(replyTo);
+        message.getMessageProperties().setCorrelationId(correlationId.getBytes());
 
         if (LOGGER.isTraceEnabled()) {
             LOGGER.trace("Sending message {} to exchange {} with correlationId {}", message, exchange, correlationId);