diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 738de269e13f..87a970c18e96 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -301,7 +301,7 @@ static int ieee80211_change_mac(struct net_device *dev, void *addr)
 	 * active (maybe other cases?) and we must get removed from it.
 	 * But we really don't care anymore if it's not registered now.
 	 */
-	if (!dev->ieee80211_ptr->registered)
+	if (!dev->ieee80211_ptr->registered || dev->ieee80211_ptr->registering)
 		return 0;
 
 	guard(wiphy)(local->hw.wiphy);