diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 4ae1185a00..4788a604db 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -901,12 +901,10 @@ carrier_changed (NMDevice *device, gboolean carrier)
 			nm_device_emit_recheck_auto_activate (device);
 		}
 	} else {
-		g_return_if_fail (priv->state >= NM_DEVICE_STATE_UNAVAILABLE);
-
 		if (priv->state == NM_DEVICE_STATE_UNAVAILABLE) {
 			if (nm_device_queued_state_peek (device) >= NM_DEVICE_STATE_DISCONNECTED)
 				nm_device_queued_state_clear (device);
-		} else {
+		} else if (priv->state >= NM_DEVICE_STATE_DISCONNECTED) {
 			nm_device_queue_state (device, NM_DEVICE_STATE_UNAVAILABLE,
 			                       NM_DEVICE_STATE_REASON_CARRIER);
 		}