diff --git a/nfc/libnfc-nci.conf b/nfc/libnfc-nci.conf
index 3db7084f..84813531 100644
--- a/nfc/libnfc-nci.conf
+++ b/nfc/libnfc-nci.conf
@@ -40,7 +40,7 @@ SCREEN_OFF_POWER_STATE=1
 # NFA_TECHNOLOGY_MASK_ISO15693      0x08    /* Proprietary Technology       */
 # NFA_TECHNOLOGY_MASK_KOVIO         0x20    /* Proprietary Technology       */
 # NFA_TECHNOLOGY_MASK_ACTIVE        0x40    /* NFC Technology Active        */
-POLLING_TECH_MASK=0x6F
+POLLING_TECH_MASK=0x2F
 
 ###############################################################################
 # Force P2P to only listen for the following technology(s).
@@ -52,7 +52,7 @@ POLLING_TECH_MASK=0x6F
 # NFA_TECHNOLOGY_MASK_A             0x01    /* NFC Technology A             */
 # NFA_TECHNOLOGY_MASK_F             0x04    /* NFC Technology F             */
 # NFA_TECHNOLOGY_MASK_ACTIVE         0x40    /* NFC Technology Active        */
-P2P_LISTEN_TECH_MASK=0x45
+P2P_LISTEN_TECH_MASK=0x00
 
 PRESERVE_STORAGE=0x01
 
@@ -75,3 +75,7 @@ NFA_MAX_EE_SUPPORTED=0x02
 # AID_MATCHING_PREFIX_ONLY 0x02
 # AID_MATCHING_EXACT_OR_SUBSET_OR_PREFIX 0x03
 AID_MATCHING_MODE=0x03
+
+###############################################################################
+#Set if the AID routing should be blocked for the power modes not supported.
+NFA_AID_BLOCK_ROUTE=1