1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/qpid/sys/rdma/RdmaIO.cpp b/cpp/src/qpid/sys/rdma/RdmaIO.cpp
index a72ed12af7..52de923248 100644
--- a/cpp/src/qpid/sys/rdma/RdmaIO.cpp
+++ b/cpp/src/qpid/sys/rdma/RdmaIO.cpp
@@ -327,10 +327,11 @@ namespace Rdma {
         }
 
         // If we've got all the write confirmations and we're draining
+        // We might get deleted in the drained callback so return immediately
         if (draining) {
             if (outstandingWrites == 0) {
-                 doDrainedCallback();
                  draining = false;
+                 doDrainedCallback();
             }
             return;
         }