diff --git a/repos/os/run/nic_router_dhcp.inc b/repos/os/run/nic_router_dhcp.inc
index 7d62956a12..cdc7c1e502 100644
--- a/repos/os/run/nic_router_dhcp.inc
+++ b/repos/os/run/nic_router_dhcp.inc
@@ -71,7 +71,7 @@ append config {
 					</config>
 
 				</inline>
-				<sleep milliseconds="3000"/>
+				<sleep milliseconds="2000"/>
 				<inline>
 
 					<config>
@@ -93,17 +93,17 @@ append config {
 					</config>
 
 				</inline>
-				<sleep milliseconds="3000"/>
+				<sleep milliseconds="2000"/>
 				<inline>
 
 					<config>
 
 						<policy label="nic_router_2 -> " domain="downlink"/>
 
-						<domain name="downlink" interface="10.2.3.1/24">
+						<domain name="downlink" interface="10.2.4.1/24">
 
-							<dhcp-server ip_first="10.2.3.2"
-							             ip_last="10.2.3.2">
+							<dhcp-server ip_first="10.2.4.2"
+							             ip_last="10.2.4.2">
 
 								<dns-server ip="6.7.8.9"/>
 
@@ -114,7 +114,26 @@ append config {
 					</config>
 
 				</inline>
-				<sleep milliseconds="3000"/>
+				<sleep milliseconds="2000"/>
+				<inline>
+
+					<config>
+
+						<policy label="nic_router_2 -> " domain="downlink"/>
+
+						<domain name="downlink" interface="10.2.4.1/24">
+
+							<dhcp-server ip_first="10.2.4.200"
+							             ip_last="10.2.4.200">
+
+							</dhcp-server>
+
+						</domain>
+
+					</config>
+
+				</inline>
+				<sleep milliseconds="2000"/>
 				<inline>
 
 					<config>
@@ -133,7 +152,7 @@ append config {
 					</config>
 
 				</inline>
-				<sleep milliseconds="3000"/>
+				<sleep milliseconds="2000"/>
 
 			</rom>
 		</config>
@@ -281,6 +300,10 @@ append done_string ".*DHCP request completed:.*\n"
 append done_string ".*  IP lease time: 3600 seconds.*\n"
 append done_string ".*  Interface: 10.0.3.2/24.*\n"
 append done_string ".*  Router: 10.0.3.1.*\n"
+append done_string ".*DHCP request completed:.*\n"
+append done_string ".*  IP lease time: 3600 seconds.*\n"
+append done_string ".*  Interface: 10.0.3.2/24.*\n"
+append done_string ".*  Router: 10.0.3.1.*\n"
 append done_string ".*  DNS server #1: 1.2.3.4.*\n"
 append done_string ".*  DNS server #2: 2.3.4.5.*\n"
 append done_string ".*  DNS server #3: 3.4.5.6.*\n"
diff --git a/repos/os/src/server/nic_router/domain.cc b/repos/os/src/server/nic_router/domain.cc
index 8e0870a59f..9ddb6f3a77 100644
--- a/repos/os/src/server/nic_router/domain.cc
+++ b/repos/os/src/server/nic_router/domain.cc
@@ -73,7 +73,7 @@ void Domain::_prepare_reconstructing_ip_config()
 
 		/* detach all dependent interfaces from old IP config */
 		_interfaces.for_each([&] (Interface &interface) {
-			interface.detach_from_ip_config();
+			interface.detach_from_ip_config(*this);
 		});
 		_ip_config_dependents.for_each([&] (Domain &domain) {
 			domain._interfaces.for_each([&] (Interface &interface) {
diff --git a/repos/os/src/server/nic_router/interface.cc b/repos/os/src/server/nic_router/interface.cc
index 6e9d3c9910..deb992d64b 100644
--- a/repos/os/src/server/nic_router/interface.cc
+++ b/repos/os/src/server/nic_router/interface.cc
@@ -412,10 +412,9 @@ void Interface::attach_to_ip_config(Domain            &domain,
 }
 
 
-void Interface::detach_from_ip_config()
+void Interface::detach_from_ip_config(Domain &domain)
 {
 	/* destroy our own ARP waiters */
-	Domain &domain = _domain();
 	while (_own_arp_waiters.first()) {
 		cancel_arp_waiting(*_own_arp_waiters.first()->object());
 	}
@@ -453,7 +452,7 @@ void Interface::attach_to_remote_ip_config()
 void Interface::_detach_from_domain()
 {
 	try {
-		detach_from_ip_config();
+		detach_from_ip_config(domain());
 		_detach_from_domain_raw();
 	}
 	catch (Pointer<Domain>::Invalid) { }
@@ -2086,7 +2085,7 @@ void Interface::handle_config_3()
 
 		/* if the IP configs differ, detach completely from the IP config */
 		if (old_domain.ip_config() != new_domain.ip_config()) {
-			detach_from_ip_config();
+			detach_from_ip_config(old_domain);
 			attach_to_domain_finish();
 			return;
 		}
diff --git a/repos/os/src/server/nic_router/interface.h b/repos/os/src/server/nic_router/interface.h
index 393b2ab45f..d76d5b8ff0 100644
--- a/repos/os/src/server/nic_router/interface.h
+++ b/repos/os/src/server/nic_router/interface.h
@@ -436,7 +436,7 @@ class Net::Interface : private Interface_list::Element
 
 		void attach_to_domain();
 
-		void detach_from_ip_config();
+		void detach_from_ip_config(Domain &domain);
 
 		void attach_to_ip_config(Domain            &domain,
 		                         Ipv4_config const &ip_config);