1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/qpid/broker/Message.cpp b/cpp/src/qpid/broker/Message.cpp
index 030e1ef581..3dbd192d3c 100644
--- a/cpp/src/qpid/broker/Message.cpp
+++ b/cpp/src/qpid/broker/Message.cpp
@@ -154,12 +154,12 @@ void Message::sendContent(framing::FrameHandler& out, uint16_t maxFrameSize) con
             store->loadContent(*this, data, offset,
                                remaining > maxContentSize ? maxContentSize : remaining);
             frame.setBof(false);
+            frame.setEof(true);
             if (offset > 0) {
                 frame.setBos(false);
             }
             if (remaining) {
                 frame.setEos(false);
-                frame.setEof(false);
             }
             out.handle(frame);
         }