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 8a054165b..293a8212c 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
@@ -59,7 +59,7 @@ public class BaseAmqpService {
      */
     @SuppressWarnings("unchecked")
     public <T> T convertMessage(final Message message, final Class<T> clazz) {
-        if (message == null || message.getBody() == null) {
+        if (isMessageBodyEmpty(message)) {
             return null;
         }
         message.getMessageProperties().getHeaders().put(AbstractJavaTypeMapper.DEFAULT_CLASSID_FIELD_NAME,
@@ -67,6 +67,10 @@ public class BaseAmqpService {
         return (T) rabbitTemplate.getMessageConverter().fromMessage(message);
     }
 
+    private boolean isMessageBodyEmpty(final Message message) {
+        return message == null || message.getBody() == null || message.getBody().length == 0;
+    }
+
     /**
      * Is needed to convert a incoming message to is originally list object
      * type.
@@ -79,7 +83,7 @@ public class BaseAmqpService {
      */
     @SuppressWarnings("unchecked")
     public <T> List<T> convertMessageList(final Message message, final Class<T> clazz) {
-        if (message == null || message.getBody() == null) {
+        if (isMessageBodyEmpty(message)) {
             return Collections.emptyList();
         }
         message.getMessageProperties().getHeaders().put(AbstractJavaTypeMapper.DEFAULT_CLASSID_FIELD_NAME,