1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/s/server.cpp b/src/mongo/s/server.cpp
index 5af21b57d7b..f657bbbbd5f 100644
--- a/src/mongo/s/server.cpp
+++ b/src/mongo/s/server.cpp
@@ -339,8 +339,8 @@ static ExitCode runMongosServer() {
     opts.port = serverGlobalParams.port;
     opts.ipList = serverGlobalParams.bind_ip;
 
-    ShardedMessageHandler handler;
-    MessageServer* server = createServer(opts, &handler);
+    auto handler = std::make_shared<ShardedMessageHandler>();
+    MessageServer* server = createServer(opts, std::move(handler));
     server->setAsTimeTracker();
     if (!server->setupSockets()) {
         return EXIT_NET_ERROR;