diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh
index 2dd0d8fc..446b8f1d 100644
--- a/inc/temp.inc.sh
+++ b/inc/temp.inc.sh
@@ -889,7 +889,6 @@ Previous Temp: ${last_temp}${GAUGESH}"
 										
 					if [ "${PW_SENSOR_ID[${SENSORa}]}" != "" ] && [ ${lastinsert} -ge ${wait} ]; then
 						if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "esxi" ]; then
-							rm -f ${PW_TMPFOLDER}/${SENSOR}*
 							entityid=($(${mysql_conn} -e "SELECT id FROM servermonitor.entities WHERE BINARY name='${vSENSOR// /_}' AND sensorid='${PW_SENSOR_ID[${SENSORa}]}'"))
 							if [ "${entityid[1]}" == "" ]; then
 								${mysql_conn} -e "USE servermonitor; INSERT INTO entities (\`sensorid\`, \`name\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','${vSENSOR// /_}')"
@@ -909,13 +908,10 @@ Previous Temp: ${last_temp}${GAUGESH}"
 								${mysql_conn} -e "USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`entity\`, \`date\`, \`speed\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','${entityid}','$(date +'%Y-%m-%d %H:%M:%S')','${FanSpeed}')"
 							fi
 						elif [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "system" ] && [[ "${SENSORa}" = *"FAN"* ]]; then
-							rm -f ${PW_TMPFOLDER}/${SENSOR}*
 							${mysql_conn} -e "USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`speed\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','$(date +'%Y-%m-%d %H:%M:%S')','${temp_f}')"
 						elif [ "${temp_h}" != "" ] && [ "${temp_h}" != "0" ]; then
-							rm -f ${PW_TMPFOLDER}/${SENSOR}*
 							QRY="USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`temp\`, \`hum\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','$(date +'%Y-%m-%d %H:%M:%S')','${temp_f}','${temp_h}')"
 						elif [ "${temp_f}" != "32.00" ]; then
-							rm -f ${PW_TMPFOLDER}/${SENSOR}*
 							QRY="USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`temp\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','$(date +'%Y-%m-%d %H:%M:%S')','${temp_f}')"
 						
 						elif [ "${SENSOR}" == "Powerwall-Switch" ]; then
@@ -926,13 +922,17 @@ Previous Temp: ${last_temp}${GAUGESH}"
 								touch ${PW_TMPFOLDER}/${SENSOR}-error.sent
 								SENDNOTICE "${SENSOR} Sensor ERROR" "ERROR reading sensor data" 1
 								echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${SENSOR} Sensor - ERROR reading sensor data" >> ${logtemp}
-							fi	
+							fi
+							QRY=''
+						fi
+						if [ "${QRY}" != "" ]; then
+							${mysql_conn} -e "${QRY}"
+							rm -f ${PW_TMPFOLDER}/${SENSOR}*
+							echo "${temp_f}" >| ${PW_TMPFOLDER}/.lastinsert/${SENSOR}
 						fi
-						${mysql_conn} -e "${QRY}"
 						# if [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "lacrosse" ]; then
 						# 	${mysql_conn} -e "USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`temp\`) VALUES ('${PW_SENSOR_ID["${SENSORa}-Probe"]}','$(date +'%Y-%m-%d %H:%M:%S')','${temp_probe_f}')"
 						# fi
-						echo "${temp_f}" >| ${PW_TMPFOLDER}/.lastinsert/${SENSOR}
 					fi
 					
 					#### LOGGING OF SERVERROOM SENSOR DIFFERENCE