diff --git a/src/nm-manager.c b/src/nm-manager.c
index 1694b4324f..336b492737 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -762,6 +762,9 @@ manager_device_state_changed (NMDevice *device,
 		break;
 	}
 
+	if (old_state >= NM_DEVICE_STATE_ACTIVATED)
+		return;
+
 	if (   new_state == NM_DEVICE_STATE_UNAVAILABLE
 	    || new_state == NM_DEVICE_STATE_DISCONNECTED)
 		nm_settings_device_added (priv->settings, device);