1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp b/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
index 82358961c8..d93416da75 100644
--- a/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
+++ b/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
@@ -59,7 +59,9 @@ void OutgoingMessage::convert(const qpid::messaging::Message& from)
         message.getMessageProperties().setReplyTo(AddressResolution::convert(address));
     }
     translate(from.getProperties(), message.getMessageProperties().getApplicationHeaders());
-    message.getDeliveryProperties().setTtl(from.getTtl().getMilliseconds());
+    if (from.getTtl().getMilliseconds()) {
+        message.getDeliveryProperties().setTtl(from.getTtl().getMilliseconds());
+    }
     if (from.getDurable()) {
         message.getDeliveryProperties().setDeliveryMode(DELIVERY_MODE_PERSISTENT);
     }