diff --git a/files/image_config/misc/docker-wait-any b/files/image_config/misc/docker-wait-any
index 3a00a2c610..f4001d7e02 100755
--- a/files/image_config/misc/docker-wait-any
+++ b/files/image_config/misc/docker-wait-any
@@ -61,6 +61,7 @@ def wait_for_container(docker_client, container_name):
 
         # Signal the main thread to exit
         g_thread_exit_event.set()
+        return
 
 
 def main():