diff --git a/src/nm-manager.c b/src/nm-manager.c
index 5ef2479512..34ec0819d5 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -194,6 +194,7 @@ typedef struct {
 	guint timestamp_update_id;
 
 	gboolean startup;
+	gboolean devices_inited;
 } NMManagerPrivate;
 
 #define NM_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_MANAGER, NMManagerPrivate))
@@ -743,6 +744,9 @@ check_if_startup_complete (NMManager *self)
 	if (!priv->startup)
 		return;
 
+	if (!priv->devices_inited)
+		return;
+
 	if (!nm_settings_get_startup_complete (priv->settings)) {
 		nm_log_dbg (LOGD_CORE, "check_if_startup_complete returns FALSE because of NMSettings");
 		return;
@@ -4206,6 +4210,8 @@ nm_manager_start (NMManager *self)
 	 */
 	system_create_virtual_devices (self);
 
+	priv->devices_inited = TRUE;
+
 	check_if_startup_complete (self);
 }