diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh
index 01cc5f5f..18264a75 100644
--- a/inc/temp.inc.sh
+++ b/inc/temp.inc.sh
@@ -981,7 +981,14 @@ CHECKTEMP_SERVICE_RUNSENSOR(){
 							temp_c=${temp_c%\'*}; temp_c=${temp_c#*=}
 						fi
 					elif [[ "${SENSOR}" = *"FAN"* ]]; then
-						if ! temp_c=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS[${SENSOR}]} cat ${PW_FANINPUT}) ; then TIMEOUT=1; fi
+						# if [ "${1}" == "Powerwall-FAN" ]; then
+							if ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS[${1}]} [ -f /sys/class/hwmon/hwmon2/fan1_input ]; then
+								FANINPUT=/sys/class/hwmon/hwmon2/fan1_input
+							elif ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS[${1}]} [ -f /sys/class/hwmon/hwmon3/fan1_input ]; then
+								FANINPUT=/sys/class/hwmon/hwmon3/fan1_input
+							fi
+						# fi
+						if ! temp_c=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS[${SENSOR}]} cat ${FANINPUT}) ; then TIMEOUT=1; fi
 						if [ "${SENSOR}" == "Powerwall-FAN" ] && [ ${temp_c} -lt 1500 ]; then
 							START_POWERWALL_FAN  >/dev/null 2>&1 &
 						fi