diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 1a05287c..167d633e 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -15,7 +15,7 @@ source /opt/idssys/nodemgmt/inc/certs.inc
 source /opt/idssys/nodemgmt/inc/sites.inc
 source /opt/idssys/nodemgmt/inc/services.inc
 
-if [ "${1}" == "report" ] || [ "${2}" == "report" ] || [ "${3}" == "report" ] || ([ "${1}" == "skip" ] && [ "${2}" == "q" ]); then
+if [ "${1}" == "report" ] || [ "${2}" == "report" ] || [ "${3}" == "report" ]; then
 	unset idsCL idsBG idsST
 	idsCL=('')
 	idsBG=('')
@@ -1228,6 +1228,10 @@ SETUPSSH_BACK(){
 }
 
 SKIP_SERVER_CHECKS(){
+	if [ "${2}" == "q" ]; then
+		unset idsCL idsBG idsST
+		idsCL=(''); idsBG=(''); idsST=('')
+	fi
 	if [ "${1}" == "on" ] || ([ ! -f ${NM_TMPFOLDER}/.skip ] && [ "${1}" == "" ]); then
 		touch ${NM_TMPFOLDER}/.skip
 		echo -e "${idsCL[Yellow]}Server will be skipped from Node-Manager Status Checks${idsCL[Default]}"