1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/qpid/broker/Message.cpp b/cpp/src/qpid/broker/Message.cpp
index 0fa8380a32..cff834c765 100644
--- a/cpp/src/qpid/broker/Message.cpp
+++ b/cpp/src/qpid/broker/Message.cpp
@@ -177,7 +177,7 @@ void Message::sendContent(Queue& queue, framing::FrameHandler& out, uint16_t max
             if (offset > 0) {
                 frame.setBos(false);
             }
-            if (remaining) {
+            if (remaining > maxContentSize) {
                 frame.setEos(false);
             }
             out.handle(frame);