diff --git a/src/nm-device-bt.c b/src/nm-device-bt.c
index c3754cddfa..726762b65f 100644
--- a/src/nm-device-bt.c
+++ b/src/nm-device-bt.c
@@ -437,7 +437,9 @@ ppp_failed (NMModem *modem, NMDeviceStateReason reason, gpointer user_data)
 	case NM_DEVICE_STATE_IP_CHECK:
 	case NM_DEVICE_STATE_SECONDARIES:
 	case NM_DEVICE_STATE_ACTIVATED:
-		if (nm_device_ip_config_should_fail (device, FALSE)) {
+		if (nm_device_activate_ip4_state_in_conf (device))
+			nm_device_activate_schedule_ip4_config_timeout (device);
+		else {
 			nm_device_state_changed (device,
 			                         NM_DEVICE_STATE_FAILED,
 			                         NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE);
diff --git a/src/nm-device-modem.c b/src/nm-device-modem.c
index b8280caf11..7f81e98187 100644
--- a/src/nm-device-modem.c
+++ b/src/nm-device-modem.c
@@ -75,7 +75,9 @@ ppp_failed (NMModem *modem, NMDeviceStateReason reason, gpointer user_data)
 	case NM_DEVICE_STATE_IP_CHECK:
 	case NM_DEVICE_STATE_SECONDARIES:
 	case NM_DEVICE_STATE_ACTIVATED:
-		if (nm_device_ip_config_should_fail (device, FALSE)) {
+		if (nm_device_activate_ip4_state_in_conf (device))
+			nm_device_activate_schedule_ip4_config_timeout (device);
+		else {
 			nm_device_state_changed (device,
 			                         NM_DEVICE_STATE_FAILED,
 			                         NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE);