diff --git a/core/mac/src/pe/lim/lim_process_disassoc_frame.c b/core/mac/src/pe/lim/lim_process_disassoc_frame.c
index ae26794f77f1..8f633fd3ed6c 100644
--- a/core/mac/src/pe/lim/lim_process_disassoc_frame.c
+++ b/core/mac/src/pe/lim/lim_process_disassoc_frame.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -316,6 +316,19 @@ lim_process_disassoc_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
 
 		return;
 	}
+#ifdef FEATURE_WLAN_TDLS
+		/**
+		 *  Delete all the TDLS peers only if Disassoc is received
+		 *  from the AP
+		 */
+		if ((LIM_IS_STA_ROLE(psessionEntry)) &&
+			((pStaDs->mlmStaContext.mlmState ==
+					eLIM_MLM_LINK_ESTABLISHED_STATE) ||
+			(pStaDs->mlmStaContext.mlmState ==
+					eLIM_MLM_IDLE_STATE)) &&
+			(IS_CURRENT_BSSID(pMac, pHdr->sa, psessionEntry)))
+			lim_delete_tdls_peers(pMac, psessionEntry);
+#endif
 
 	if (pStaDs->mlmStaContext.mlmState != eLIM_MLM_LINK_ESTABLISHED_STATE) {
 		/**