diff --git a/defaults.inc b/defaults.inc
index 0cfa2ca5..145db36d 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -109,13 +109,19 @@ if [ -f ${NM_FOLDER}/defaults.local.inc ]; then
 fi
 
 TSI=$(/sbin/ip link | grep tailscale0)
-[ ${#TSI} != 0 ] && RUN_NODE_IP=$(/sbin/ip -o -4 addr list tailscale0 | awk '{print $4}' | cut -d/ -f1) || RUN_NODE_IP=$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1)
+[ ${#TSI} != 0 ] && TSIP=$(/sbin/ip -o -4 addr list tailscale0 | awk '{print $4}' | cut -d/ -f1) || TSIP=
+RNIP=$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1)
 for NTYPE in "${NM_NODE_TYPES[@]}"; do
 	var=${NTYPE}_HOSTS[@]
 	RUN_NODE_TYPE=""
 	for nip in "${!var}"; do
-		if [[ "${RUN_NODE_IP}" == *"${nip}"* ]]; then
+		if [[ "${RNIP}" == *"${nip}"* ]]; then
 			RUN_NODE_TYPE=${NTYPE};
+			RUN_NODE_IP=${RNIP}
+			break 2
+		elif [[ "${TSIP}" == *"${nip}"* ]]; then
+			RUN_NODE_TYPE=${NTYPE};
+			RUN_NODE_IP=${TSIP}
 			break 2
 		fi
 	done