diff --git a/powerwall.sh b/powerwall.sh
index 328ddc8e..76be9f16 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -394,12 +394,13 @@ DAILYTEMP(){
 				temp_c=''
 		
 			fi
-		
+			c=0; spc=''; spc1=`expr ${cw} - ${#SENSOR}`; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
 			if [ "$temp_c" != "null" ] && [ "$temp_c" != "" ]; then
 				temp_f=`echo "scale=2; $temp_c*1.8 + 32" | bc`
-				
-				c=0; spc=''; spc1=`expr ${cw} - ${#SENSOR}`; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
 				echo -e "${SENSOR}${spc}${temp_f}'F / ${average1}'F / ${average7}'F"
+				
+			else
+				echo -e "${SENSOR}${spc}No Data"
 			
 			fi
 		done