diff --git a/dkms.conf b/dkms.conf
index 6593c14..b8ff468 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,5 +1,5 @@
 PACKAGE_NAME="realtek-rtl88xxau"
-PACKAGE_VERSION="5.6.4.2~20200125"
+PACKAGE_VERSION="5.6.4.2~20200201"
 CLEAN="'make' clean"
 BUILT_MODULE_NAME[0]=88XXau
 PROCS_NUM=`nproc`
diff --git a/hal/rtl8812a/usb/rtl8812au_xmit.c b/hal/rtl8812a/usb/rtl8812au_xmit.c
index f5e7a76..13f4c60 100644
--- a/hal/rtl8812a/usb/rtl8812au_xmit.c
+++ b/hal/rtl8812a/usb/rtl8812au_xmit.c
@@ -304,7 +304,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz , u8 ba
 			if (pattrib->retry_ctrl == _TRUE)
 				SET_TX_DESC_DATA_RETRY_LIMIT_8812(ptxdesc, 6);
 			else
-				SET_TX_DESC_DATA_RETRY_LIMIT_8812(ptxdesc, 12);
+				SET_TX_DESC_DATA_RETRY_LIMIT_8812(ptxdesc, 0);
 		}
 
 #ifdef CONFIG_XMIT_ACK
diff --git a/hal/rtl8814a/usb/rtl8814au_xmit.c b/hal/rtl8814a/usb/rtl8814au_xmit.c
index a0b0ae2..a9bb42a 100644
--- a/hal/rtl8814a/usb/rtl8814au_xmit.c
+++ b/hal/rtl8814a/usb/rtl8814au_xmit.c
@@ -242,6 +242,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag
 			SET_TX_DESC_TX_RATE_8814A(ptxdesc, MRateToHwRate(pattrib->rate));
 		}
 
+#ifdef CONFIG_BEAMFORMING
 		// VHT NDPA or HT NDPA Packet for Beamformer.
 		if ((pattrib->subtype == WIFI_NDPA) ||
 			((pattrib->subtype == WIFI_ACTION_NOACK) && (pattrib->order == 1)))
@@ -265,12 +266,13 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag
 			}
 		}
 		else
+#endif
 		{
 			SET_TX_DESC_RETRY_LIMIT_ENABLE_8814A(ptxdesc, 1);
 			if (pattrib->retry_ctrl == _TRUE) {
 				SET_TX_DESC_DATA_RETRY_LIMIT_8814A(ptxdesc, 6);
 			} else {
-				SET_TX_DESC_DATA_RETRY_LIMIT_8814A(ptxdesc, 12);
+				SET_TX_DESC_DATA_RETRY_LIMIT_8814A(ptxdesc, 0);
 			}
 		}