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 9636de5c7..d1bf85103 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
@@ -408,7 +408,7 @@ public class AmqpMessageHandlerService extends BaseAmqpService {
 
         if (ArrayUtils.isNotEmpty(message.getMessageProperties().getCorrelationId())) {
             actionStatus.addMessage(RepositoryConstants.SERVER_MESSAGE_PREFIX + "DMF message correlation-id "
-                    + new String(message.getMessageProperties().getCorrelationId()));
+                    + convertCorrelationId(message));
         }
 
         actionStatus.setAction(action);
@@ -416,6 +416,10 @@ public class AmqpMessageHandlerService extends BaseAmqpService {
         return actionStatus;
     }
 
+    private static String convertCorrelationId(final Message message) {
+        return new String(message.getMessageProperties().getCorrelationId());
+    }
+
     private Action getUpdateActionStatus(final ActionStatus actionStatus) {
         if (actionStatus.getStatus().equals(Status.CANCELED)) {
             return controllerManagement.addCancelActionStatus(actionStatus);