diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index 5e5bc599da4c..0a065de8f98b 100644
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -633,6 +633,9 @@ int ieee80211_key_link(struct ieee80211_key *key,
 
 	increment_tailroom_need_count(sdata);
 
+	if (old_key)
+		ieee80211_key_disable_hw_accel(old_key);
+
 	ieee80211_key_replace(sdata, sta, pairwise, old_key, key);
 	ieee80211_key_destroy(old_key, true);