diff --git a/powerwall.sh b/powerwall.sh
index f4dc47e7..c9e9e3a7 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -237,11 +237,11 @@ DAILYTEMP(){
 		average1=$(AVERAGETEMP ${SENSOR} 1)
 		average7=$(AVERAGETEMP ${SENSOR} 7)
 	
-		if [ "${SENSOR_TYPE[${1}]}" == "mqtt" ]; then
+		if [ "${SENSOR_TYPE[${SENSOR}]}" == "mqtt" ]; then
 			mqtt_message=`${mqtt_conn} -t tele/${1}/SENSOR -C 1`
 			echo $mqtt_message | cut -d':' -f 6 | cut -d',' -f 1 | read temp_c
 		
-		elif [ "${SENSOR_TYPE[${1}]}" == "system" ]; then
+		elif [ "${SENSOR_TYPE[${SENSOR}]}" == "system" ]; then
 			temp_c=$(vcgencmd measure_temp)
 			temp_c=${temp_c%\'*}; temp_c=${temp_c#*=}
 		
@@ -256,7 +256,6 @@ DAILYTEMP(){
 			
 		fi
 	done
-	[ "${action}" != "" ] && echo
 }