1 files changed, 8 insertions, 4 deletions
diff --git a/qpid/cpp/src/qpid/broker/Connection.cpp b/qpid/cpp/src/qpid/broker/Connection.cpp
index 0b3059d26c..8451f35cb0 100644
--- a/qpid/cpp/src/qpid/broker/Connection.cpp
+++ b/qpid/cpp/src/qpid/broker/Connection.cpp
@@ -443,10 +443,14 @@ void Connection::setHeartbeatInterval(uint16_t heartbeat)
 {
     setHeartbeat(heartbeat);
     if (heartbeat > 0 && !isShadow()) {
-        heartbeatTimer = new ConnectionHeartbeatTask(heartbeat, timer, *this);
-        timer.add(heartbeatTimer);
-        timeoutTimer = new ConnectionTimeoutTask(heartbeat, timer, *this);
-        timer.add(timeoutTimer);
+        if (!heartbeatTimer) {
+            heartbeatTimer = new ConnectionHeartbeatTask(heartbeat, timer, *this);
+            timer.add(heartbeatTimer);
+        }
+        if (!timeoutTimer) {
+            timeoutTimer = new ConnectionTimeoutTask(heartbeat, timer, *this);
+            timer.add(timeoutTimer);
+        }
     }
 }