diff --git a/scripts/healthcheck.bash b/scripts/healthcheck.bash
index 39009eb..480ec8b 100755
--- a/scripts/healthcheck.bash
+++ b/scripts/healthcheck.bash
@@ -5,7 +5,7 @@ wait-for-status() {
     echo "Waiting for services status"
     echo ""
     bash -c \
-    'while [[ "$(npm run status)" == *"(starting)"* ]];\
+    'while [[ "$(npm run status)" == *"(starting)"*] || ["$(npm run status)" == *"(Exited)"*]];\
     do echo "Waiting for services" && sleep 2;\
     done'
 }