diff --git a/src/modules/producer.js b/src/modules/producer.js
index <HASH>..<HASH> 100644
--- a/src/modules/producer.js
+++ b/src/modules/producer.js
@@ -132,12 +132,11 @@ function checkRpc(queue, msg, options) {
         //reply to us if you receive this message!
         options.replyTo = amqpRPCQueues[queue].queue;
 
-        return publishOrSendToQueue.call(this, queue, msg, options)
-          .then(() => {
+        if (publishOrSendToQueue.call(this, queue, msg, options)) {
             //defered promise that will resolve when response is received
             amqpRPCQueues[queue][corrId] = Promise.defer();
             return amqpRPCQueues[queue][corrId].promise;
-          });
+        }
       });
   }
Create defered promise on RPC only when message is truly sent