diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c
index 19ca1d1e9b..9a7d8e07cb 100644
--- a/src/core/nm-manager.c
+++ b/src/core/nm-manager.c
@@ -4632,7 +4632,9 @@ ensure_master_active_connection(NMManager            *self,
                 continue;
 
             if (nm_device_is_real(candidate)
-                && nm_device_get_state(candidate) != NM_DEVICE_STATE_DISCONNECTED)
+                && !NM_IN_SET(nm_device_get_state(candidate),
+                              NM_DEVICE_STATE_DISCONNECTED,
+                              NM_DEVICE_STATE_DEACTIVATING))
                 continue;
 
             master_ac = nm_manager_activate_connection(