diff --git a/powerwall.sh b/powerwall.sh
index c1020637..fcc08423 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -749,14 +749,18 @@ CHECKPOWER(){
 						HOST_WATTS_disp="${idsCL[LightRed]}Could not pull data"
 					fi
 				# fi
-				if [ "${avgdays}" != "" ]; then
+				if [ "${avgdays}" != "" ] && [ "${HOST_WATTS}" != "0" ]; then
 					average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} ${avgdays})
 					average_disp="${idsCL[LightYellow]}			`IDS_NUMBER_FORMAT ${average}`'watts"
 				else
 					average_disp=""
 				fi
 				echo -en "\r\033[K"
-				echo -e "${idsCL[White]}${SENSOR}            ${idsCL[Default]}: ${HOST_WATTS_disp}${average_disp}	${idsCL[LightCyan]}[PS1=${PS1}'A, PS2=${PS2}'A]${idsCL[Default]}"
+				if [ "${HOST_WATTS}" != "0" ]; then
+					echo -e "${idsCL[White]}${SENSOR}            ${idsCL[Default]}: ${HOST_WATTS_disp}${average_disp}	${idsCL[LightCyan]}[PS1=${PS1}'A, PS2=${PS2}'A]${idsCL[Default]}"
+				else
+					echo -e "${idsCL[White]}${SENSOR}            ${idsCL[Default]}: ${HOST_WATTS_disp}${average_disp}${idsCL[Default]}"
+				fi
 			fi
 		fi
 	done