diff --git a/src/nm-manager.c b/src/nm-manager.c
index 9ea3e403f4..90ad66403e 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -3178,8 +3178,6 @@ unmanaged_to_disconnected (NMDevice *device)
 	 * and force the device to be managed. */
 	nm_device_set_unmanaged_by_flags (device, NM_UNMANAGED_PLATFORM_INIT, FALSE, NM_DEVICE_STATE_REASON_USER_REQUESTED);
 
-	if (nm_device_sys_iface_state_get (device)  == NM_DEVICE_SYS_IFACE_STATE_REMOVED)
-		nm_device_sys_iface_state_set (device, NM_DEVICE_SYS_IFACE_STATE_ASSUME);
 	nm_device_set_unmanaged_by_flags (device, NM_UNMANAGED_USER_EXPLICIT, FALSE, NM_DEVICE_STATE_REASON_USER_REQUESTED);
 
 	g_return_if_fail (nm_device_get_managed (device, FALSE));
@@ -3544,6 +3542,9 @@ _new_active_connection (NMManager *self,
 		                                   error);
 	}
 
+	if (device && (activation_type == NM_ACTIVATION_TYPE_MANAGED))
+		nm_device_sys_iface_state_set (device, NM_DEVICE_SYS_IFACE_STATE_MANAGED);
+
 	return (NMActiveConnection *) nm_act_request_new (settings_connection,
 	                                                  applied,
 	                                                  specific_object,