diff --git a/umac/cmn_services/crypto/src/wlan_crypto_global_api.c b/umac/cmn_services/crypto/src/wlan_crypto_global_api.c
index 4a975cb5f3c5..bd633c9d0162 100644
--- a/umac/cmn_services/crypto/src/wlan_crypto_global_api.c
+++ b/umac/cmn_services/crypto/src/wlan_crypto_global_api.c
@@ -343,7 +343,8 @@ QDF_STATUS wlan_crypto_setkey(struct wlan_objmgr_vdev *vdev,
 
 		req_key->flags |= (WLAN_CRYPTO_KEY_XMIT
 					| WLAN_CRYPTO_KEY_RECV);
-		req_key->flags |= WLAN_CRYPTO_KEY_GROUP;
+		if (isbcast)
+			req_key->flags |= WLAN_CRYPTO_KEY_GROUP;
 	}
 
 	vdev_mode = wlan_vdev_mlme_get_opmode(vdev);
@@ -384,20 +385,6 @@ QDF_STATUS wlan_crypto_setkey(struct wlan_objmgr_vdev *vdev,
 			}
 			key = crypto_priv->key[req_key->keyix];
 		}
-		if (vdev_mode == QDF_STA_MODE) {
-			peer = wlan_vdev_get_bsspeer(vdev);
-			if (!peer) {
-				qdf_print("%s[%d] peer is null\n",
-							__func__, __LINE__);
-				return QDF_STATUS_E_INVAL;
-			}
-			wlan_objmgr_peer_try_get_ref(peer, WLAN_CRYPTO_ID);
-			wlan_peer_obj_lock(peer);
-			qdf_mem_copy(macaddr, wlan_peer_get_macaddr(peer),
-						WLAN_ALEN);
-			wlan_peer_obj_unlock(peer);
-			wlan_objmgr_peer_release_ref(peer, WLAN_CRYPTO_ID);
-		}
 	} else {
 		peer = wlan_objmgr_get_peer_by_mac_n_vdev(
 					psoc,