diff --git a/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpSenderService.java b/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpSenderService.java
index 6cb3dd9be..f44e2e9bb 100644
--- a/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpSenderService.java
+++ b/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpSenderService.java
@@ -24,10 +24,10 @@ public interface AmqpSenderService {
      * 
      * @param message
      *            the amqp message
-     * @param uri
+     * @param replyTo
      *            the reply to uri
      */
-    void sendMessage(Message message, URI uri);
+    void sendMessage(Message message, URI replyTo);
 
     /**
      * Extract the exchange from the uri. Default implementation removes the
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 9586633bf..244544b64 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
@@ -10,6 +10,7 @@ package org.eclipse.hawkbit.amqp;
 
 import java.net.URI;
 
+import org.eclipse.hawkbit.util.IpUtil;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 
@@ -33,8 +34,12 @@ public class DefaultAmqpSenderService implements AmqpSenderService {
     }
 
     @Override
-    public void sendMessage(final Message message, final URI uri) {
-        internalAmqpTemplate.send(extractExchange(uri), null, message);
+    public void sendMessage(final Message message, final URI replyTo) {
+        if (!IpUtil.isAmqpUri(replyTo)) {
+            return;
+        }
+
+        internalAmqpTemplate.send(extractExchange(replyTo), null, message);
     }
 
 }