diff --git a/inc/status.inc b/inc/status.inc
index 32f0dcd3..570b9d53 100755
--- a/inc/status.inc
+++ b/inc/status.inc
@@ -175,6 +175,7 @@ STATUS(){
 							sr=0
 							for srvc in "${!srvcs}"; do
 								[ "${srvc}" == "gitea" ] && [ "${NTYPE}" == "WEB" ] && [[ $($NCMD /sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) != *${NM_SINGLESRVR_IP['WEB']}* ]] && NOGOCHK=false || NOGOCHK=true
+								[ "${srvc}" == "headscale" ] && [ "${NTYPE}" == "HS" ] && [[ $($NCMD /sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) != *${NM_SINGLESRVR_IP['HS']}* ]] && NOGOCHK=false
 								[ "${srvc}" == "keepalived" ] && [ "${nip}" == "10.2.1.2" ] && NOGOCHK=false
 								if [ ${NOGOCHK} == true ]; then
 									if [ "${ST_ACTION}" != "check" ]; then
@@ -225,7 +226,7 @@ STATUS(){
 
 										fi
 										# if [ "${srvc}" == "pdnsadmin.socket" ] || [ "${srvc}" == "pdnsadmin" ] || [ "${srvc}" == "gitea" ]; then
-										if [ "${srvc}" == "gitea" ]; then
+										if [ "${srvc}" == "gitea" ] || [ "${srvc}" == "headscale" ]; then
 											rm -f ${NM_FOLDER}/*~${srvc}.*
 										fi
 									fi