diff --git a/powerwall.sh b/powerwall.sh
index 331fac87..bd1f1bbf 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -56,21 +56,27 @@ CHECKTEMP_SERVICE(){
 				[ $temp_diff -lt 0 ] && temp_diff=$((temp_diff * -1))
 						
 				if [ $(bc -l <<< "$temp_f >= $temp_warn") -eq 1 ] && [ $(bc -l <<< "$temp_f < $temp_crit") -eq 1 ]; then
-					[ $temp_diff -gt 1 ] && echo "($temp_diff) WARNING TEMP: $temp_f°F" | mail -s "${1} TEMP WARNING" $email_alert
+					if [ [ $temp_diff -gt 1 ] || [ "$last_temp" == "0" ] ]; then
+						echo "($temp_diff) WARNING TEMP: $temp_f°F" | mail -s "${1} TEMP WARNING" $email_alert
+						last_temp=$temp_f
+					fi
 					echo "($temp_d @ $temp_t) WARNING: $temp_f°F"
 					
 				elif [ $(bc -l <<< "$temp_f >= $temp_crit") -eq 1 ]; then
-					[ $temp_diff -gt 1 ] && echo "CRITICAL TEMP: $temp_f°F" | mail -s "${1} TEMP CRITICAL" $email_alert
+					if [ [ $temp_diff -gt 1 ] || [ "$last_temp" == "0" ] ]; then
+						echo "CRITICAL TEMP: $temp_f°F" | mail -s "${1} TEMP CRITICAL" $email_alert
+						last_temp=$temp_f
+					fi
 					echo "($temp_d @ $temp_t) CRITICAL: $temp_f°F"
 					
-					#else 
+				else
+					last_temp=0
 					# echo "NORMAL TEMP: $temp_f°F" | mail -s "${1} TEMP NORMAL" $email_alert
 					#echo "($temp_d @ $temp_t) normal: $temp_f°F"
 				fi
 				
 				QRY="USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`temp\`, \`hum\`) VALUES ('${SENSOR_ID[$1]}','${temp_d} ${temp_t}','${temp_f}','${temp_h}')"
 				${mysql_conn} -e "${QRY}"
-				last_temp=$temp_f
 			fi
 	    done
 	    sleep 10