diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index c16aebcfb..725e8ead4 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -899,12 +899,17 @@ function interface_bring_down($interface = 'wan', $ifacecfg = false)
             interface_track6_configure($interface, $ifcfg);
             break;
         default:
-            if (is_ipaddrv6($ifcfg['ipaddrv6'])) {
-                mwexecf('/sbin/ifconfig %s inet6 %s delete', [$realifv6, $ifcfg['ipaddrv6']]);
-            }
             break;
     }
 
+    /* may be required or not, but kept here for symmetry with IPv4 */
+    if (!empty($ifcfg['ipaddrv6'])) {
+        list ($ip6) = interfaces_primary_address6($interface);
+        if (!empty($ip6)) {
+            mwexecf('/sbin/ifconfig %s inet6 %s delete', [$realifv6, $ip6]);
+        }
+    }
+
     switch ($ifcfg['ipaddr']) {
         case 'ppp':
         case 'pppoe':
@@ -925,14 +930,20 @@ function interface_bring_down($interface = 'wan', $ifacecfg = false)
             break;
         case 'dhcp':
             killbypid("/var/run/dhclient.{$realif}.pid", 'TERM', true);
+            @unlink("/tmp/{$realif}_oldip"); /* XXX dhclient cannot signal a release */
             break;
         default:
-            if (is_ipaddrv4($ifcfg['ipaddr'])) {
-                mwexecf('/sbin/ifconfig %s delete %s', [$realif, $ifcfg['ipaddr']]);
-            }
             break;
     }
 
+    /* required for static and dhcp (dhclient limitation) */
+    if (!empty($ifcfg['ipaddr'])) {
+        list ($ip4) = interfaces_primary_address($interface);
+        if (!empty($ip4)) {
+            mwexecf('/sbin/ifconfig %s delete %s', [$realif, $ip4]);
+        }
+    }
+
     /* clear stale state associated with this interface */
     mwexecf('/usr/local/sbin/ifctl -4c -i %s', $realif);
     mwexecf('/usr/local/sbin/ifctl -6c -i %s', $realifv6);
@@ -3112,6 +3123,7 @@ function interface_dhcp_configure($interface = 'wan')
     }
 
     killbypid("/var/run/dhclient.{$wanif}.pid", 'TERM', true);
+    @unlink("/tmp/{$realif}_oldip"); /* XXX dhclient cannot signal a release */
 
     $fd = fopen("/var/etc/dhclient_{$interface}.conf", "w");
     if (!$fd) {
diff --git a/src/opnsense/scripts/interfaces/dhclient-script b/src/opnsense/scripts/interfaces/dhclient-script
index 629dc5eb2..6fd5c5b21 100755
--- a/src/opnsense/scripts/interfaces/dhclient-script
+++ b/src/opnsense/scripts/interfaces/dhclient-script
@@ -354,7 +354,6 @@ EXPIRE|FAIL)
 			;;
 		esac
 	fi
-	/usr/local/sbin/configctl -d interface newip $interface
 	;;
 
 TIMEOUT)