diff --git a/tools/arkmanager b/tools/arkmanager
index 5242cc0..17c9ee1 100755
--- a/tools/arkmanager
+++ b/tools/arkmanager
@@ -3735,6 +3735,9 @@ main(){
     case "$command" in
       wait)
         doWait "${options[@]}"
+	if [ "$#" == 0 ]; then
+	  break
+	fi
         continue
       ;;
     esac