diff --git a/Makefile b/Makefile
index 1c442ef..5bd9074 100755
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ CONFIG_AUTOCFG_CP = n
 CONFIG_MULTIDRV = n
 CONFIG_RTL8188E = n
 CONFIG_RTL8812A = y
-CONFIG_RTL8821A = n
+CONFIG_RTL8821A = y
 CONFIG_RTL8192E = n
 CONFIG_RTL8723B = n
 CONFIG_RTL8814A = n
diff --git a/dkms.conf b/dkms.conf
index 70bc95c..acd9a23 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,5 +1,5 @@
 PACKAGE_NAME="realtek-rtl8812au"
-PACKAGE_VERSION="5.2.20.2~20180703"
+PACKAGE_VERSION="5.2.20.2~20180704"
 BUILT_MODULE_NAME[0]="8812au"
 PROCS_NUM=`nproc`
 [ $PROCS_NUM -gt 16 ] && PROCS_NUM=16
diff --git a/hal/rtl8812a/rtl8812a_hal_init.c b/hal/rtl8812a/rtl8812a_hal_init.c
index 09169a3..e4c872c 100644
--- a/hal/rtl8812a/rtl8812a_hal_init.c
+++ b/hal/rtl8812a/rtl8812a_hal_init.c
@@ -568,11 +568,16 @@ FirmwareDownload8812(
 		#ifdef CONFIG_AP_WOWLAN
 			if (pwrpriv->wowlan_ap_mode) {
 #ifdef CONFIG_RTL8812A
-				pFirmware->szFwBuffer = array_mp_8812a_fw_ap;
-				pFirmware->ulFwLength = array_length_mp_8812a_fw_ap;
-#else
-				pFirmware->szFwBuffer = array_mp_8821a_fw_ap;
-				pFirmware->ulFwLength = array_length_mp_8821a_fw_ap;
+				if (pHalData->odmpriv.support_ic_type == ODM_RTL8812) {
+					pFirmware->szFwBuffer = array_mp_8812a_fw_ap;
+					pFirmware->ulFwLength = array_length_mp_8812a_fw_ap;
+				}
+#endif
+#ifdef CONFIG_RTL8821A
+				if (pHalData->odmpriv.support_ic_type == ODM_RTL8821) {
+					pFirmware->szFwBuffer = array_mp_8821a_fw_ap;
+					pFirmware->ulFwLength = array_length_mp_8821a_fw_ap;
+				}
 #endif
 
 				RTW_INFO("%s fw: %s, size: %d\n", __func__, "AP_WoWLAN", pFirmware->ulFwLength);