diff --git a/modules/distribution/src/core/bin/analytics.sh b/modules/distribution/src/core/bin/analytics.sh
index 04b66792..6b924b76 100755
--- a/modules/distribution/src/core/bin/analytics.sh
+++ b/modules/distribution/src/core/bin/analytics.sh
@@ -61,10 +61,6 @@ ANALYTICS_INIT_SCRIPT="$CARBON_HOME/wso2/analytics/bin/wso2server.sh"
 
 # If the daemon is not there, then exit.
 
-sh $ANALYTICS_INIT_SCRIPT $* &
+$ANALYTICS_INIT_SCRIPT $*
+exit;
 
-trap "sh $ANALYTICS_INIT_SCRIPT stop; exit;" INT TERM
-while :
-do
-        sleep 60
-done
diff --git a/modules/distribution/src/core/bin/broker.sh b/modules/distribution/src/core/bin/broker.sh
index ea94ffc4..b3f1a715 100755
--- a/modules/distribution/src/core/bin/broker.sh
+++ b/modules/distribution/src/core/bin/broker.sh
@@ -61,10 +61,5 @@ BROKER_INIT_SCRIPT="$CARBON_HOME/wso2/broker/bin/wso2server.sh"
 
 # If the daemon is not there, then exit.
 
-sh $BROKER_INIT_SCRIPT $* &
-
-trap "sh $BROKER_INIT_SCRIPT stop; exit;" INT TERM
-while :
-do
-        sleep 60
-done
+$BROKER_INIT_SCRIPT $*
+exit;