diff --git a/src/sbin/ppp-linkdown b/src/sbin/ppp-linkdown
index fbecaaadb..25353d07c 100755
--- a/src/sbin/ppp-linkdown
+++ b/src/sbin/ppp-linkdown
@@ -5,8 +5,12 @@ AF="${2}"
 IP="${3}"
 GW=
 
+DEFAULTGW=$(route -n get -${AF} default | grep gateway: | awk '{print $2}')
+
 /usr/local/etc/rc.kill_states ${IF} ${IP}
 
+ngctl shutdown ${1}:
+
 if [ "${AF}" = "inet" ]; then
 	if [ -f /tmp/${IF}up ] && [ -f /conf/${IF}.log ]; then
 		seconds=$((`date -j +%s` - `/usr/bin/stat -f %m /tmp/${IF}up`))
@@ -16,38 +20,40 @@ if [ "${AF}" = "inet" ]; then
 	if [ -s "/tmp/${IF}_defaultgw" ]; then
 		GW=$(head -n 1 /tmp/${IF}_defaultgw)
 	fi
-	if [ -n "${GW}" ]; then
-		/sbin/route delete -${AF} default ${GW}
+	if [ -n "${GW}" -a "${DEFAULTGW}" = "${GW}" ]; then
+		echo "Removing stale PPPoE gateway ${GW} on ${AF}" | logger -t ppp-linkdown
+		route delete -${AF} default "${GW}"
 	fi
 
 	if [ -f "/var/etc/nameserver_${IF}" ]; then
 		# Remove old entries
 		for nameserver in $(cat /var/etc/nameserver_${IF}); do
-			/sbin/route delete ${nameserver} >/dev/null 2>&1
+			route delete ${nameserver} >/dev/null 2>&1
 		done
-		/bin/rm -f /var/etc/nameserver_${IF}
+		rm -f /var/etc/nameserver_${IF}
 	fi
 
 	# Do not remove gateway used during filter reload.
-	/bin/rm -f /tmp/${IF}_router /tmp/${IF}up /tmp/${IF}_ip
+	rm -f /tmp/${IF}_router /tmp/${IF}up /tmp/${IF}_ip
 elif [ "${AF}" = "inet6" ]; then
 	if [ -s "/tmp/${IF}_defaultgwv6" ]; then
 		GW=$(head -n 1 /tmp/${IF}_defaultgwv6)
 	fi
-	if [ -n "${GW}" ]; then
-		/sbin/route delete -${AF} default ${GW}
+	if [ -n "${GW}" -a "${DEFAULTGW}" = "${GW}" ]; then
+		echo "Removing stale PPPoE gateway ${GW} on ${AF}" | logger -t ppp-linkdown
+		route delete -${AF} default "${GW}"
 	fi
 
 	if [ -f "/var/etc/nameserver_v6${IF}" ]; then
 		# Remove old entries
 		for nameserver in $(cat /var/etc/nameserver_v6${IF}); do
-			/sbin/route delete ${nameserver} >/dev/null 2>&1
+			route delete ${nameserver} >/dev/null 2>&1
 		done
-		/bin/rm -f /var/etc/nameserver_v6${IF}
+		rm -f /var/etc/nameserver_v6${IF}
 	fi
 
 	# Do not remove gateway used during filter reload.
-	/bin/rm -f /tmp/${IF}_routerv6 /tmp/${IF}upv6 /tmp/${IF}_ipv6
+	rm -f /tmp/${IF}_routerv6 /tmp/${IF}upv6 /tmp/${IF}_ipv6
 fi
 
 /usr/local/opnsense/service/configd_ctl.py dns reload