diff --git a/powerwall.sh b/powerwall.sh
index 685911d2..e794a51d 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -746,7 +746,7 @@ DOWNLIST(){
 	
 	if [ "${DOWNLIST}" != "" ]; then
 		[ "${1}" == "report" ] && dlen=100 || dlen=110
-		echo -e "${idsCL[LightGreen]}Current List of Items Down...${idsCL[Default]}"
+		echo -e "${idsCL[LightGreen]}Current List of Sensors/Devices Down...${idsCL[Default]}"
 		DIVIDER false yellow ${dlen}
 		if [ "${1}" == "report" ]; then
 			echo -e "${idsCL[Yellow]}[Type]     [Host/Service/Docker Name]         [Host]              [Down_Time]${idsCL[Default]}"
@@ -761,14 +761,16 @@ DOWNLIST(){
 				ditem=${downitem##*/}; ditem=${ditem//.down}
 				if [ "${PW_SENSOR_TYPE[${ditem}]}" == "esxi" ]; then
 					itemname=${ditem}
-					itemtype=ESXi HOST
-					
+					itemtype="ESXi HOST"
+					itemaddr=${PW_HOST_ADDRESSES[${ditem}]}
 				elif [ "${PW_SENSOR_TYPE[${ditem}]}" == "system" ] || [ "${PW_SENSOR_TYPE[${ditem}]}" == "cpu" ] || [ "${PW_SENSOR_TYPE[${ditem}]}" == "remotesystem" ]; then
 					itemname=${ditem}
 					itemtype=DEVICE
+					itemaddr=${PW_REMOTE_SENSORS[${ditem}]}
 				else
 					itemname=${ditem}
 					itemtype=SENSOR
+					itemaddr=''
 				fi
 		
 				if [ -f ${PW_TMPFOLDER}/${ditem}-error.reading ]; then