diff --git a/powerwall.sh b/powerwall.sh
index 9866c036..2382c045 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -95,10 +95,11 @@ CHECKTEMPSENSOR(){
 	echo ${PW_TEMP_THRESHOLDS[${1}]} | cut -d',' -f 1 | read temp_warn
 	echo ${PW_TEMP_THRESHOLDS[${1}]} | cut -d',' -f 2 | read temp_crit
 	if [ "${6}" != "noavg" ]; then
+		[ "${6}" != "" ] && avgdays=${6} || avgdays=3
 		if [ "${PW_SENSOR_TYPE[${1}]}" != "esxi" ]; then
-			average=$(AVERAGETEMP ${PW_SENSOR_ID[${1}]} 3)
+			average=$(AVERAGETEMP ${PW_SENSOR_ID[${1}]} ${avgdays})
 		else
-			average=$(AVERAGETEMP ${PW_SENSOR_ID[${1}]} 3 ${5})
+			average=$(AVERAGETEMP ${PW_SENSOR_ID[${1}]} ${avgdays} ${5})
 		fi
 	else
 		average=''