1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/qpid/client/ConnectionImpl.cpp b/cpp/src/qpid/client/ConnectionImpl.cpp
index f6c7176664..f1379296fd 100644
--- a/cpp/src/qpid/client/ConnectionImpl.cpp
+++ b/cpp/src/qpid/client/ConnectionImpl.cpp
@@ -176,10 +176,11 @@ void ConnectionImpl::idleOut()
 
 void ConnectionImpl::close()
 {
-    if (!handler.isOpen()) return;
     if (heartbeatTask) {
         heartbeatTask->cancel();
     }
+
+    if (!handler.isOpen()) return;
     handler.close();
     closed(CLOSE_CODE_NORMAL, "Closed by client");
 }