diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index 76831317f09b..9edadf77f669 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -21129,7 +21129,10 @@ static void hdd_set_wapi_crypto_key_mgmt_param(struct hdd_adapter *adapter)
 	if (adapter->wapi_info.wapi_auth_mode == WAPI_AUTH_MODE_CERT)
 		HDD_SET_BIT(set_val, WLAN_CRYPTO_KEY_MGMT_WAPI_CERT);
 
+	/* Set AKM and original AKM type */
 	wlan_crypto_set_vdev_param(vdev, WLAN_CRYPTO_PARAM_KEY_MGMT, set_val);
+	wlan_crypto_set_vdev_param(vdev, WLAN_CRYPTO_PARAM_ORIG_KEY_MGMT,
+				   set_val);
 
 	set_val = 0;
 	HDD_SET_BIT(set_val, WLAN_CRYPTO_CIPHER_WAPI_SMS4);