diff --git a/modules/distribution/src/resources/bin/start-all.sh b/modules/distribution/src/resources/bin/start-all.sh
index 6bf60277..86cf3237 100644
--- a/modules/distribution/src/resources/bin/start-all.sh
+++ b/modules/distribution/src/resources/bin/start-all.sh
@@ -37,10 +37,13 @@ PRGDIR=`dirname "$PRG"`
 sh "$CARBON_HOME/core/bin/wso2server.sh" $* &
 sh "$CARBON_HOME/analytics/bin/wso2server.sh" $* &
 
-trap "sh $CARBON_HOME/bin/stop-all.sh; exit;" SIGINT SIGTERM
-
-while :
-do
-sleep 60
-done
+if [ ! -z "$*" ]; then
+    exit;
+else
+    trap "sh $CARBON_HOME/bin/stop-all.sh; exit;" SIGINT SIGTERM
+    while :
+    do
+            sleep 60
+    done
 
+fi
\ No newline at end of file