1 files changed, 4 insertions, 1 deletions
diff --git a/src/mongo/s/mongos_main.cpp b/src/mongo/s/mongos_main.cpp
index dd78e7772d1..665f3fe08d4 100644
--- a/src/mongo/s/mongos_main.cpp
+++ b/src/mongo/s/mongos_main.cpp
@@ -316,7 +316,10 @@ void cleanupTask(const ShutdownTaskArgs& shutdownArgs) {
 
         ReplicaSetMonitor::shutdown();
 
-        opCtx->setIsExecutingShutdown();
+        {
+            stdx::lock_guard lg(client);
+            opCtx->setIsExecutingShutdown();
+        }
 
         if (serviceContext) {
             serviceContext->setKillAllOperations();