diff --git a/src/aws/dependencies/utilitiyFunction.sh b/src/aws/dependencies/utilitiyFunction.sh
index 7284740..1b2d7aa 100644
--- a/src/aws/dependencies/utilitiyFunction.sh
+++ b/src/aws/dependencies/utilitiyFunction.sh
@@ -89,7 +89,7 @@ function waitForConditionalOutput() {
       fi
     fi
     attempt=$((attempt + 1))
-    sleep 5
+    sleep 10
   done
 
   echo "Error: Failed to meet the condition after $maxAttempts attempts."
diff --git a/src/aws/up.sh b/src/aws/up.sh
index 19cf2a8..668cb0e 100644
--- a/src/aws/up.sh
+++ b/src/aws/up.sh
@@ -191,7 +191,11 @@ function up {
   if [ -z "$instanceId" ]; then
     createAndTagInstance
   else
-    instanceState=$(checkInstanceState $instanceId)
+    instanceState=$(waitForConditionalOutput "checkInstanceState $instanceId" "\"stopping\"" "different")
+    if [ $? -ne 0 ]; then
+      echo "Wait for starting on start command until instance is stopped."
+      exit 1
+    fi
 
     case "$instanceState" in
     "running")