1 files changed, 2 insertions, 0 deletions
diff --git a/cpp/lib/broker/BrokerChannel.cpp b/cpp/lib/broker/BrokerChannel.cpp
index cae48273ff..0d867d0cf3 100644
--- a/cpp/lib/broker/BrokerChannel.cpp
+++ b/cpp/lib/broker/BrokerChannel.cpp
@@ -330,10 +330,12 @@ void Channel::handleMethodInContext(
         connection.client->getConnection().close(
             context, e.code, e.toString(),
             method->amqpClassId(), method->amqpMethodId());
+        connection.getOutput().close();
     }catch(std::exception& e){
         connection.client->getConnection().close(
             context, 541/*internal error*/, e.what(),
             method->amqpClassId(), method->amqpMethodId());
+        connection.getOutput().close();
     }
 }