1 files changed, 6 insertions, 2 deletions
diff --git a/src/mongo/db/db.cpp b/src/mongo/db/db.cpp
index 35b1250a81a..4722cf846a8 100644
--- a/src/mongo/db/db.cpp
+++ b/src/mongo/db/db.cpp
@@ -736,8 +736,12 @@ ExitCode _initAndListen(int listenPort) {
               << startupWarningsLog;
     }
 
-    uassertStatusOK(ShardingState::get(startupOpCtx.get())
-                        ->initializeShardingAwarenessIfNeeded(startupOpCtx.get()));
+    auto shardingInitialized =
+        uassertStatusOK(ShardingState::get(startupOpCtx.get())
+                            ->initializeShardingAwarenessIfNeeded(startupOpCtx.get()));
+    if (shardingInitialized) {
+        reloadShardRegistryUntilSuccess(startupOpCtx.get());
+    }
 
     if (!storageGlobalParams.readOnly) {
         logStartup(startupOpCtx.get());