diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index d81321444..a06fa8435 100644
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -2072,9 +2072,12 @@ static int wpa_driver_nl80211_set_key(const char *ifname, void *priv,
 	 */
 	if (ret || !set_tx || alg == WPA_ALG_NONE)
 		return ret;
-#ifdef HOSTAPD /* FIX: is this needed? */
+#ifdef HOSTAPD
 	if (addr)
 		return ret;
+#else /* HOSTAPD */
+	if (drv->nlmode == NL80211_IFTYPE_AP && addr)
+		return ret;
 #endif /* HOSTAPD */
 
 	msg = nlmsg_alloc();