1 files changed, 4 insertions, 2 deletions
diff --git a/src/mongo/rpc/metadata/client_metadata.cpp b/src/mongo/rpc/metadata/client_metadata.cpp
index a4b78080ec9..ccd11fb542e 100644
--- a/src/mongo/rpc/metadata/client_metadata.cpp
+++ b/src/mongo/rpc/metadata/client_metadata.cpp
@@ -472,7 +472,8 @@ bool ClientMetadata::tryFinalize(Client* client) {
 
 const ClientMetadata* ClientMetadata::getForClient(Client* client) noexcept {
     auto& state = getClientState(client);
-    if (!state.isFinalized || !state.meta) {
+    if (!state.meta) {
+        // If we haven't finalized, it's still okay to return our existing value.
         return nullptr;
     }
     return &state.meta.get();
@@ -514,7 +515,7 @@ void ClientMetadata::setFromMetadataForOperation(OperationContext* opCtx, BSONEl
     auto wasFinalized = std::exchange(state.isFinalized, true);
     uassert(ErrorCodes::ClientMetadataCannotBeMutated,
             "The client metadata document may only be set once per operation",
-            !wasFinalized);
+            !state.meta && !wasFinalized);
 
     state.meta = ClientMetadata::readFromMetadata(elem);
 }
@@ -541,6 +542,7 @@ void ClientMetadata::setFromMetadata(Client* client, BSONElement& elem) {
     }
 
     auto lk = stdx::lock_guard(*client);
+    invariant(!state.meta, "ClientMetadata was previously set, it should be set precisely once");
     state.meta = std::move(meta);
 }