diff --git a/6.0-rc/docker-entrypoint.sh b/6.0-rc/docker-entrypoint.sh
index 939de322a9..0996ba0536 100755
--- a/6.0-rc/docker-entrypoint.sh
+++ b/6.0-rc/docker-entrypoint.sh
@@ -393,6 +393,9 @@ if [ "$originalArgOne" = 'mongod' ]; then
 		done
 
 		"${mongodHackedArgs[@]}" --shutdown
+		while ps "$(< "$pidfile")" &> /dev/null; do
+			sleep 1
+		done
 		rm -f "$pidfile"
 
 		echo
diff --git a/6.0/docker-entrypoint.sh b/6.0/docker-entrypoint.sh
index 939de322a9..0996ba0536 100755
--- a/6.0/docker-entrypoint.sh
+++ b/6.0/docker-entrypoint.sh
@@ -393,6 +393,9 @@ if [ "$originalArgOne" = 'mongod' ]; then
 		done
 
 		"${mongodHackedArgs[@]}" --shutdown
+		while ps "$(< "$pidfile")" &> /dev/null; do
+			sleep 1
+		done
 		rm -f "$pidfile"
 
 		echo
diff --git a/7.0/docker-entrypoint.sh b/7.0/docker-entrypoint.sh
index 939de322a9..0996ba0536 100755
--- a/7.0/docker-entrypoint.sh
+++ b/7.0/docker-entrypoint.sh
@@ -393,6 +393,9 @@ if [ "$originalArgOne" = 'mongod' ]; then
 		done
 
 		"${mongodHackedArgs[@]}" --shutdown
+		while ps "$(< "$pidfile")" &> /dev/null; do
+			sleep 1
+		done
 		rm -f "$pidfile"
 
 		echo
diff --git a/8.0/docker-entrypoint.sh b/8.0/docker-entrypoint.sh
index 939de322a9..0996ba0536 100755
--- a/8.0/docker-entrypoint.sh
+++ b/8.0/docker-entrypoint.sh
@@ -393,6 +393,9 @@ if [ "$originalArgOne" = 'mongod' ]; then
 		done
 
 		"${mongodHackedArgs[@]}" --shutdown
+		while ps "$(< "$pidfile")" &> /dev/null; do
+			sleep 1
+		done
 		rm -f "$pidfile"
 
 		echo
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 939de322a9..0996ba0536 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -393,6 +393,9 @@ if [ "$originalArgOne" = 'mongod' ]; then
 		done
 
 		"${mongodHackedArgs[@]}" --shutdown
+		while ps "$(< "$pidfile")" &> /dev/null; do
+			sleep 1
+		done
 		rm -f "$pidfile"
 
 		echo