diff --git a/mgmt/scan.c b/mgmt/scan.c
index bc46d68..67e2a57 100644
--- a/mgmt/scan.c
+++ b/mgmt/scan.c
@@ -2550,7 +2550,7 @@
 			if ((prBssDesc->eBSSType == eBSSType)
 #if CFG_ENABLE_WIFI_DIRECT
 			    || ((eBSSType == BSS_TYPE_P2P_DEVICE) &&
-				    (prBssDesc->fgIsP2PReport == TRUE ||
+				    (prBssDesc->fgIsP2PReport == TRUE &&
 				     prAdapter->p2p_scan_report_all_bss))
 #endif
 			    ) {
@@ -2574,7 +2574,7 @@
 					}
 				} else {
 #if CFG_ENABLE_WIFI_DIRECT
-					if ((prBssDesc->fgIsP2PReport == TRUE ||
+					if ((prBssDesc->fgIsP2PReport == TRUE &&
 					      prAdapter->p2p_scan_report_all_bss) &&
 					    prBssDesc->u2RawLength != 0) {
 #endif