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 c3811626e..d9af2b533 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
@@ -8,6 +8,9 @@
  */
 package org.eclipse.hawkbit.amqp;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 
 import org.slf4j.Logger;
@@ -55,6 +58,27 @@ public class BaseAmqpService {
         return (T) messageConverter.fromMessage(message);
     }
 
+    /**
+     * Is needed to convert a incoming message to is originally object type.
+     *
+     * @param message
+     *            the message to convert.
+     * @param clazz
+     *            the class of the originally object.
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+    protected <T> List<T> convertMessageList(final Message message, final Class<T> clazz) {
+        if (message == null) {
+            return Collections.emptyList();
+        }
+        message.getMessageProperties().getHeaders().put(AbstractJavaTypeMapper.DEFAULT_CLASSID_FIELD_NAME,
+                ArrayList.class);
+        message.getMessageProperties().getHeaders().put(AbstractJavaTypeMapper.DEFAULT_CONTENT_CLASSID_FIELD_NAME,
+                clazz.getTypeName());
+        return (List<T>) messageConverter.fromMessage(message);
+    }
+
     protected String getStringHeaderKey(final Message message, final String key, final String errorMessageIfNull) {
         final Map<String, Object> header = message.getMessageProperties().getHeaders();
         final Object value = header.get(key);