1 files changed, 1 insertions, 2 deletions
diff --git a/cpp/src/qpid/broker/MessageBuilder.cpp b/cpp/src/qpid/broker/MessageBuilder.cpp
index 1a58523c08..56b4b3b4d8 100644
--- a/cpp/src/qpid/broker/MessageBuilder.cpp
+++ b/cpp/src/qpid/broker/MessageBuilder.cpp
@@ -54,8 +54,7 @@ void MessageBuilder::setHeader(AMQHeaderBody::shared_ptr& header){
     message->setHeader(header);
     if (stagingThreshold && header->getContentSize() >= stagingThreshold) {
         store->stage(message);
-        auto_ptr<Content> content(new LazyLoadedContent(store, message->getPersistenceId(), message->expectedContentSize()));
-        message->setContent(content);
+        message->releaseContent(store);
     } else {
         auto_ptr<Content> content(new InMemoryContent());
         message->setContent(content);