diff --git a/src/n-dhcp4/src/n-dhcp4-c-lease.c b/src/n-dhcp4/src/n-dhcp4-c-lease.c
index a30b455356..be0d78869b 100644
--- a/src/n-dhcp4/src/n-dhcp4-c-lease.c
+++ b/src/n-dhcp4/src/n-dhcp4-c-lease.c
@@ -354,28 +354,12 @@ _c_public_ int n_dhcp4_client_lease_query(NDhcp4ClientLease *lease, uint8_t opti
  *   Returns -ENOTRECOVERABLE when called in an unexpected state.
  */
 _c_public_ int n_dhcp4_client_lease_select(NDhcp4ClientLease *lease) {
-        NDhcp4ClientLease *l, *t_l;
-        NDhcp4ClientProbe *probe;
-        int r;
-
         if (!lease->probe)
                 return -ENOTRECOVERABLE;
         if (lease->probe->current_lease)
                 return -ENOTRECOVERABLE;
 
-        r = n_dhcp4_client_probe_transition_select(lease->probe, lease->message, n_dhcp4_gettime(CLOCK_BOOTTIME));
-        if (r)
-                return r;
-
-        /*
-         * Only one of the offered leases can be selected, so flush the list.
-         * All offered lease, including this one are now dead.
-         */
-        probe = lease->probe;
-        c_list_for_each_entry_safe(l, t_l, &probe->lease_list, probe_link)
-                n_dhcp4_client_lease_unlink(l);
-
-        return 0;
+        return n_dhcp4_client_probe_transition_select(lease->probe, lease->message, n_dhcp4_gettime(CLOCK_BOOTTIME));
 }
 
 /**
@@ -392,20 +376,12 @@ _c_public_ int n_dhcp4_client_lease_select(NDhcp4ClientLease *lease) {
  *   Returns -ENOTRECOVERABLE when called in an unexpected state.
  */
 _c_public_ int n_dhcp4_client_lease_accept(NDhcp4ClientLease *lease) {
-        int r;
-
         if (!lease->probe)
                 return -ENOTRECOVERABLE;
         if (lease->probe->current_lease != lease)
                 return -ENOTRECOVERABLE;
 
-        r = n_dhcp4_client_probe_transition_accept(lease->probe, lease->message);
-        if (r)
-                return r;
-
-        n_dhcp4_client_lease_unlink(lease);
-
-        return 0;
+        return n_dhcp4_client_probe_transition_accept(lease->probe, lease->message);
 }
 
 /**
@@ -422,19 +398,10 @@ _c_public_ int n_dhcp4_client_lease_accept(NDhcp4ClientLease *lease) {
  *   Returns -ENOTRECOVERABLE when called in an unexpected state.
  */
 _c_public_ int n_dhcp4_client_lease_decline(NDhcp4ClientLease *lease, const char *error) {
-        int r;
-
         if (!lease->probe)
                 return -ENOTRECOVERABLE;
         if (lease->probe->current_lease != lease)
                 return -ENOTRECOVERABLE;
 
-        r = n_dhcp4_client_probe_transition_decline(lease->probe, lease->message, error, n_dhcp4_gettime(CLOCK_BOOTTIME));
-        if (r)
-                return r;
-
-        lease->probe->current_lease = n_dhcp4_client_lease_unref(lease->probe->current_lease);
-        n_dhcp4_client_lease_unlink(lease);
-
-        return 0;
+        return n_dhcp4_client_probe_transition_decline(lease->probe, lease->message, error, n_dhcp4_gettime(CLOCK_BOOTTIME));
 }
diff --git a/src/n-dhcp4/src/n-dhcp4-c-probe.c b/src/n-dhcp4/src/n-dhcp4-c-probe.c
index f5d93b394a..dcd51c6f3e 100644
--- a/src/n-dhcp4/src/n-dhcp4-c-probe.c
+++ b/src/n-dhcp4/src/n-dhcp4-c-probe.c
@@ -1024,6 +1024,7 @@ static int n_dhcp4_client_probe_transition_nak(NDhcp4ClientProbe *probe) {
 
 int n_dhcp4_client_probe_transition_select(NDhcp4ClientProbe *probe, NDhcp4Incoming *offer, uint64_t ns_now) {
         _c_cleanup_(n_dhcp4_outgoing_freep) NDhcp4Outgoing *request = NULL;
+        NDhcp4ClientLease *l, *t_l;
         int r;
 
         switch (probe->state) {
@@ -1042,10 +1043,15 @@ int n_dhcp4_client_probe_transition_select(NDhcp4ClientProbe *probe, NDhcp4Incom
                 else
                         request = NULL; /* consumed */
 
-                /* XXX: ignore other offers */
-
                 probe->state = N_DHCP4_CLIENT_PROBE_STATE_REQUESTING;
 
+                /*
+                 * Only one of the offered leases can be selected, so flush the list.
+                 * All offered lease, including this one are now dead.
+                 */
+                c_list_for_each_entry_safe(l, t_l, &probe->lease_list, probe_link)
+                        n_dhcp4_client_lease_unlink(l);
+
                 return 0;
         case N_DHCP4_CLIENT_PROBE_STATE_INIT:
         case N_DHCP4_CLIENT_PROBE_STATE_INIT_REBOOT:
@@ -1083,7 +1089,7 @@ int n_dhcp4_client_probe_transition_accept(NDhcp4ClientProbe *probe, NDhcp4Incom
                         return r;
 
                 probe->state = N_DHCP4_CLIENT_PROBE_STATE_BOUND;
-
+                n_dhcp4_client_lease_unlink(probe->current_lease);
                 n_dhcp4_client_arm_timer(probe->client);
 
                 return 0;
@@ -1124,6 +1130,9 @@ int n_dhcp4_client_probe_transition_decline(NDhcp4ClientProbe *probe, NDhcp4Inco
 
                 /* XXX: what state to transition to? */
 
+                n_dhcp4_client_lease_unlink(probe->current_lease);
+                probe->current_lease = n_dhcp4_client_lease_unref(probe->current_lease);
+
                 return 0;
 
         case N_DHCP4_CLIENT_PROBE_STATE_INIT: