diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh
index f9a8579c..0a25c9b7 100644
--- a/inc/temp.inc.sh
+++ b/inc/temp.inc.sh
@@ -416,7 +416,9 @@ CHECKTEMP_SERVICE(){
 				if [ "$(grep -oP '(?<=ztemprun.).*?(?=.done)' <<< "${sensor}")" != "*" ]; then
 					rm -f ${sensor}
 					((s_count++))
+					[ -f ${PW_TMPFOLDER}/.lastfancheck/${sensor}* ] && rm -f ${PW_TMPFOLDER}/.lastfancheck/${sensor}*
 				fi
+				
 			done
 			[ ${s_count} -eq ${#SENSORS_CHECKED[@]} ] && completed=true
 			if [ $(($(date +%s)-scanstart)) -gt 300 ]; then
@@ -840,9 +842,6 @@ Previous Temp: ${last_temp}${GAUGESH}"
 			echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${SENSORa} Sensor - ERROR reading sensor data" >> ${logtemp}
 			[ "${PW_SENSOR_TYPE[${SENSORa}]}" == "esxi" ] && [ -f ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.set ] && rm -f ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.set
 		fi
-		if [ "${PW_HOST_ADDRESSES[${SENSORa}]}" != "" ] && [ -f ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}* ]; then
-			rm -f ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}*
-		fi
 	fi
 	rm -f ${PW_TMPFOLDER}/ztemprun.${SENSORa}.running
 	touch ${PW_TMPFOLDER}/ztemprun.${SENSORa}.done