diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
index 3bb78c4b4a..bc23ef0198 100644
--- a/src/core/devices/nm-device.c
+++ b/src/core/devices/nm-device.c
@@ -9956,8 +9956,25 @@ _dev_ipdhcpx_notify(NMDhcpClient *client, const NMDhcpClientNotifyData *notify_d
             return;
         }
 
-        if (notify_data->lease_update.accepted) {
+        if (notify_data->lease_update.accepted)
             _LOGT_ipdhcp(addr_family, "lease accepted");
+        else
+            _LOGT_ipdhcp(addr_family, "lease update");
+
+        nm_dhcp_config_set_lease(priv->ipdhcp_data_x[IS_IPv4].config,
+                                 notify_data->lease_update.l3cd);
+
+        /* Schedule a commit of the configuration. If the DHCP client
+         * needs to accept the lease, it will send later a LEASE_UPDATE
+         * notification with accepted=1 once the address appears in platform.
+         * Otherwise, this notification already has accepted=1. */
+        _dev_l3_register_l3cds_set_one_full(self,
+                                            L3_CONFIG_DATA_TYPE_DHCP_X(IS_IPv4),
+                                            notify_data->lease_update.l3cd,
+                                            NM_L3CFG_CONFIG_FLAGS_FORCE_ONCE,
+                                            FALSE);
+
+        if (notify_data->lease_update.accepted) {
             if (priv->ipdhcp_data_x[IS_IPv4].state != NM_DEVICE_IP_STATE_READY) {
                 _dev_ipdhcpx_set_state(self, addr_family, NM_DEVICE_IP_STATE_READY);
                 nm_dispatcher_call_device(NM_DISPATCHER_ACTION_DHCP_CHANGE_X(IS_IPv4),
@@ -9968,20 +9985,8 @@ _dev_ipdhcpx_notify(NMDhcpClient *client, const NMDhcpClientNotifyData *notify_d
                                           NULL);
                 _dev_ip_state_check_async(self, addr_family);
             }
-            return;
         }
 
-        /* Schedule a commit of the configuration. The DHCP client
-         * will accept the lease once the address is committed, and
-         * will send a LEASE_UPDATE notification with accepted=1. */
-        _LOGT_ipdhcp(addr_family, "lease update");
-        nm_dhcp_config_set_lease(priv->ipdhcp_data_x[IS_IPv4].config,
-                                 notify_data->lease_update.l3cd);
-        _dev_l3_register_l3cds_set_one_full(self,
-                                            L3_CONFIG_DATA_TYPE_DHCP_X(IS_IPv4),
-                                            notify_data->lease_update.l3cd,
-                                            NM_L3CFG_CONFIG_FLAGS_FORCE_ONCE,
-                                            FALSE);
         return;
     }
 
diff --git a/src/core/dhcp/nm-dhcp-client.c b/src/core/dhcp/nm-dhcp-client.c
index 54f9ee59fd..ec910389f4 100644
--- a/src/core/dhcp/nm-dhcp-client.c
+++ b/src/core/dhcp/nm-dhcp-client.c
@@ -379,18 +379,24 @@ nm_dhcp_client_set_state(NMDhcpClient *self, NMDhcpState new_state, const NML3Co
      * as a static address (bypassing ACD), then NML3Cfg is aware of that and signals
      * immediate success. */
 
+    if (nm_dhcp_client_can_accept(self) && new_state == NM_DHCP_STATE_BOUND && priv->l3cd
+        && nm_l3_config_data_get_num_addresses(priv->l3cd, priv->config.addr_family) > 0) {
+        priv->l3cfg_notify.wait_dhcp_commit = TRUE;
+    } else {
+        priv->l3cfg_notify.wait_dhcp_commit = FALSE;
+    }
+    connect_l3cfg_notify(self);
+
     {
         const NMDhcpClientNotifyData notify_data = {
             .notify_type = NM_DHCP_CLIENT_NOTIFY_TYPE_LEASE_UPDATE,
             .lease_update =
                 {
-                    .l3cd = priv->l3cd,
+                    .l3cd     = priv->l3cd,
+                    .accepted = !priv->l3cfg_notify.wait_dhcp_commit,
                 },
         };
 
-        priv->l3cfg_notify.wait_dhcp_commit = (new_state == NM_DHCP_STATE_BOUND);
-        connect_l3cfg_notify(self);
-
         _emit_notify(self, &notify_data);
     }
 }