diff --git a/files/image_config/misc/docker-wait-any b/files/image_config/misc/docker-wait-any
index 4200bb43c8..3a00a2c610 100755
--- a/files/image_config/misc/docker-wait-any
+++ b/files/image_config/misc/docker-wait-any
@@ -46,10 +46,9 @@ g_dep_services = []
 
 
 def wait_for_container(docker_client, container_name):
-    while True:
-        while docker_client.inspect_container(container_name)['State']['Status'] != "running":
-            time.sleep(1)
+    log.log_info("Waiting on container '{}'".format(container_name))
 
+    while True:
         docker_client.wait(container_name)
 
         log.log_info("No longer waiting on container '{}'".format(container_name))