diff --git a/powerwall.sh b/powerwall.sh
index 71707523..ba0fe572 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -432,7 +432,7 @@ Previous Temp: ${last_temp[${SENSOR}]}'F"
 							else
 								wait=300
 							fi
-							if [ ${lastinsert} -ge ${wait} ] && [ "${PW_SENSOR_ID[${SENSORa}]}" != "" ]; then
+							if [ "${PW_SENSOR_ID[${SENSORa}]}" != "" ] && [ ${lastinsert} -ge ${wait} ]; then
 								if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "esxi" ]; then
 									entityid=($(${mysql_conn} -e "SELECT id FROM servermonitor.entities WHERE BINARY name='${vSENSOR// /_}' AND sensorid='${PW_SENSOR_ID[${SENSORa}]}'"))
 									if [ "${entityid[1]}" == "" ]; then
@@ -443,8 +443,7 @@ Previous Temp: ${last_temp[${SENSOR}]}'F"
 									
 									QRY="USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`entity\`, \`date\`, \`temp\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','${entityid}','$(date +'%Y-%m-%d %H:%M:%S')','${temp_f}')"
 									if [ "${PW_HOST_IDRACS[${SENSORa}]}" == "10.2.1.21" ] && [ "${vSENSOR// /_}" == "System_Board_Inlet" ] && [ "${vHOSTFAN}" != "" ]; then
-										QRY2="USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`speed\`) VALUES ('14','$(date +'%Y-%m-%d %H:%M:%S')','${FanSpeed}')"
-										${mysql_conn} -e "${QRY2}"
+										${mysql_conn} -e "USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`speed\`) VALUES ('14','$(date +'%Y-%m-%d %H:%M:%S')','${FanSpeed}')"
 									fi
 								elif [ "${temp_h}" != "" ]; then
 									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}')"