diff --git a/powerwall.sh b/powerwall.sh
index 4238d933..0da9f227 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -819,20 +819,22 @@ CHECKPOWER(){
 
 					MSG="${idsCL[White]}${SENSOR}            ${idsCL[Default]}: ${HOST_WATTS_disp}"
 					echo -en "\r\033[K${MSG}"
-
-					if [ "${avgdays}" != "" ] && [ ${HOST_WATTS} -gt 0 ]; then
-						echo -en "${idsCL[LightYellow]}		Calculating average ...${idsCL[Default]}"
-						average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} ${avgdays}); average_disp="${idsCL[LightYellow]}		`IDS_NUMBER_FORMAT ${average}`'watts"
-						echo -en "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}"
-					elif [ ${HOST_WATTS} -gt 0 ]; then
-						echo -en "${idsCL[Cyan]}	[PS1=${idsCL[LightCyan]}${PS1}'A${idsCL[Cyan]}, PS2=${idsCL[LightCyan]}${PS2}'A${idsCL[Cyan]}]"
-					fi
-					if [ "${PW_HOST_IDRACS[${SENSOR}]}" == "10.2.1.21" ] && [ ${HOST_WATTS} -ge 0 ]; then
-						vHOSTFAN=$(snmpwalk -v 1 -c public -t 2 ${PW_HOST_IDRACS[${SENSOR}]} .1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3 -O vq)
-						FanSpeed=`echo "scale=2; ${vHOSTFAN}/21200" | bc`; FanSpeed=`echo "scale=0; ${FanSpeed}*100/1" | bc`						
-						# vHOSTFAN=$(ssh root@${PW_RACADM_ACCESS} racadm -r ${PW_HOST_IDRACS[${SENSOR}]} -u ${PW_ESXI_USER} -p "'${PW_ESXI_PASS}'" getsensorinfo | grep "System Board Fan1" 2>&1)
-						# FanSpeed=$(echo ${vHOSTFAN} | awk '/ / {print $8}' | sed -e 's/%//g')
-						echo -en "${idsCL[LightCyan]}	[FanSpeed=${FanSpeed}'%]"
+					
+					if [ "${HOST_WATT_SENSORS}" != "" ]; then
+						if [ "${avgdays}" != "" ] && [ ${HOST_WATTS} -gt 0 ]; then
+							echo -en "${idsCL[LightYellow]}		Calculating average ...${idsCL[Default]}"
+							average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} ${avgdays}); average_disp="${idsCL[LightYellow]}		`IDS_NUMBER_FORMAT ${average}`'watts"
+							echo -en "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}"
+						elif [ ${HOST_WATTS} -gt 0 ]; then
+							echo -en "${idsCL[Cyan]}	[PS1=${idsCL[LightCyan]}${PS1}'A${idsCL[Cyan]}, PS2=${idsCL[LightCyan]}${PS2}'A${idsCL[Cyan]}]"
+						fi
+						if [ "${PW_HOST_IDRACS[${SENSOR}]}" == "10.2.1.21" ] && [ ${HOST_WATTS} -ge 0 ]; then
+							vHOSTFAN=$(snmpwalk -v 1 -c public -t 2 ${PW_HOST_IDRACS[${SENSOR}]} .1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3 -O vq)
+							FanSpeed=`echo "scale=2; ${vHOSTFAN}/21200" | bc`; FanSpeed=`echo "scale=0; ${FanSpeed}*100/1" | bc`						
+							# vHOSTFAN=$(ssh root@${PW_RACADM_ACCESS} racadm -r ${PW_HOST_IDRACS[${SENSOR}]} -u ${PW_ESXI_USER} -p "'${PW_ESXI_PASS}'" getsensorinfo | grep "System Board Fan1" 2>&1)
+							# FanSpeed=$(echo ${vHOSTFAN} | awk '/ / {print $8}' | sed -e 's/%//g')
+							echo -en "${idsCL[LightCyan]}	[FanSpeed=${FanSpeed}'%]"
+						fi
 					fi
 					
 					echo -e "${idsCL[Default]}"