diff --git a/powerwall.sh b/powerwall.sh
index 4a6ee391..7ce5eb89 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -738,7 +738,7 @@ SHUTDOWN_SERVERS(){
 	echo "($datetime) - Shutting down ${1} servers" >> ${PW_LOGFILE}
 	[ "${TEST}" == "true" ] && echo "RUNNING IN TEST MODE" >> ${PW_LOGFILE}
 		
-	if [ "${1}" == "MAIN" ]; then
+	if [ "${1}" == "MAIN" ] || [ "${1}" == "ALL" ]; then
 		if [ ! -f $FOLDER/shutdown.main ]; then
 			touch $FOLDER/shutdown.main
 			echo -en "Disabling CLS in vCenter ... "
@@ -789,8 +789,8 @@ SHUTDOWN_SERVERS(){
 				echo "Done"
 			done
 		fi
-		
-	elif [ "${1}" = "SYS" ]; then
+	fi
+	if [ "${1}" == "SYS" ] || [ "${1}" == "ALL" ]; then
 		[ ! -f $FOLDER/shutdown.main ] && [ "${2}" == "TEMP" ] && SHUTDOWN_SERVERS MAIN
 		if [ ! -f $FOLDER/shutdown.sys ]; then
 			touch $FOLDER/shutdown.sys