diff --git a/sdc-os-chef/sdc-elasticsearch/startup.sh b/sdc-os-chef/sdc-elasticsearch/startup.sh
index 1871d68..3c2cc4c 100644
--- a/sdc-os-chef/sdc-elasticsearch/startup.sh
+++ b/sdc-os-chef/sdc-elasticsearch/startup.sh
@@ -3,8 +3,9 @@
 cd /root/chef-solo/
 chef-solo -c solo.rb -E ${ENVNAME}
 
-chef_status=$?
+rc=$?
+if [[ $rc != 0 ]]; then exit $rc; fi
 
 /docker-entrypoint.sh elasticsearch &
 
-exec "$@";
\ No newline at end of file
+while true; do sleep 30; done
\ No newline at end of file