diff --git a/src/etc/rc.linkup b/src/etc/rc.linkup
index ab4f151439..5ca5c9f96f 100755
--- a/src/etc/rc.linkup
+++ b/src/etc/rc.linkup
@@ -118,6 +118,8 @@ function handle_argument_group($iface, $argument2) {
 				 * see https://redmine.pfsense.org/issues/11570 */
 				if (!$staticv4) {
 					touch("{$g['tmp_path']}/{$iface}_upstart4");
+				}
+				if (!$staticv6) {
 					touch("{$g['tmp_path']}/{$iface}_upstart6");
 				}
 				// Do not try to readd to bridge otherwise em(4) has problems
diff --git a/src/etc/rc.newwanip b/src/etc/rc.newwanip
index 34aa4c602d..293b6ddbc8 100755
--- a/src/etc/rc.newwanip
+++ b/src/etc/rc.newwanip
@@ -212,7 +212,8 @@ if (platform_booting() && !in_array(substr($interface_real, 0, 3), array("ppp",
  * could be failing back in which case we need to switch IPs back anyhow.
  */
 if (!is_ipaddr($oldip) || ($curwanip != $oldip) || file_exists("{$g['tmp_path']}/{$interface}_upstart4") ||
-    (!is_ipaddrv4($config['interfaces'][$interface]['ipaddr']) && ($config['interfaces'][$interface]['ipaddr'] != 'dhcp'))) {
+    (!is_ipaddrv4($config['interfaces'][$interface]['ipaddr']) && ($config['interfaces'][$interface]['ipaddr'] != 'dhcp')) ||
+	 ($curwanip == $oldip) && !file_exists("{$g['tmp_path']}/{$interface}_upstart4")) {
 	/*
 	 * Some services (e.g. dyndns, see ticket #4066) depend on
 	 * filter_configure() to be called before, otherwise pass out