diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c
index 959aa8379ccf957a7196283df3c3d98f6aa79bbf..a52fb3a4a455fdc77fe166945978d7a5635c3134 100644
--- a/net/mac80211/wext.c
+++ b/net/mac80211/wext.c
@@ -675,7 +675,7 @@ static int ieee80211_ioctl_siwencode(struct net_device *dev,
 		!sdata->default_key,
 		keybuf, erq->length);
 
-	if (!ret) {
+	if (!ret && sdata->vif.type == NL80211_IFTYPE_STATION) {
 		if (remove)
 			sdata->u.mgd.flags &= ~IEEE80211_STA_TKIP_WEP_USED;
 		else