diff --git a/msmnile_au/WCNSS_qcom_cfg_qca6174.ini b/msmnile_au/WCNSS_qcom_cfg_qca6174.ini
index 67d2ef131855d4ab383be552bad116256928ae13..a3f0b05d2ec8e43bf7b698e766820494d4177353 100644
--- a/msmnile_au/WCNSS_qcom_cfg_qca6174.ini
+++ b/msmnile_au/WCNSS_qcom_cfg_qca6174.ini
@@ -468,6 +468,8 @@ enable_rtt_mac_randomization=1
 #Enable/Disable SNR monitoring
 gEnableSNRMonitoring=1
 
+gInterfaceChangeWait=20
+
 END
 
 # Note: Configuration parser would not read anything past the END marker
diff --git a/msmnile_au/WCNSS_qcom_cfg_qca6390.ini b/msmnile_au/WCNSS_qcom_cfg_qca6390.ini
index 684de48907c9a358f26474cffa316990e88d0522..4a28541aead3921b32f7cfa43db573abf0602ada 100644
--- a/msmnile_au/WCNSS_qcom_cfg_qca6390.ini
+++ b/msmnile_au/WCNSS_qcom_cfg_qca6390.ini
@@ -492,7 +492,7 @@ gEnableSNRMonitoring=1
 #Set STA+SAP SCC dfs master support
 g_sta_sap_scc_on_dfs_chan=2
 
-gInterfaceChangeWait=0
+gInterfaceChangeWait=20
 
 spectral_disable=1
 
diff --git a/msmnile_au/WCNSS_qcom_cfg_qcn7605.ini b/msmnile_au/WCNSS_qcom_cfg_qcn7605.ini
index 8be4a2322ffd63e464b0165a9054d88476c3b387..76b55404f698b5973a39d588310080fa53fbf3b8 100644
--- a/msmnile_au/WCNSS_qcom_cfg_qcn7605.ini
+++ b/msmnile_au/WCNSS_qcom_cfg_qcn7605.ini
@@ -470,7 +470,7 @@ gEnableLPRx=0
 # Set WMI Credit
 gWmiCreditCount=1
 
-gInterfaceChangeWait=500000
+gInterfaceChangeWait=20
 gBpfFilterEnable=0
 gActiveMcBcBpfMode=0 
 gSoftApMaxPeers=10
diff --git a/sdmshrike_au/WCNSS_qcom_cfg_qca6174.ini b/sdmshrike_au/WCNSS_qcom_cfg_qca6174.ini
index 7da95700e62e1f163791e58831f90e614e999884..04cbf56e83481c4fadad7cab8a0966bf19dd94b2 100644
--- a/sdmshrike_au/WCNSS_qcom_cfg_qca6174.ini
+++ b/sdmshrike_au/WCNSS_qcom_cfg_qca6174.ini
@@ -468,6 +468,8 @@ enable_rtt_mac_randomization=1
 #Enable/Disable SNR monitoring
 gEnableSNRMonitoring=1
 
+gInterfaceChangeWait=20
+
 END
 
 # Note: Configuration parser would not read anything past the END marker
diff --git a/sdmshrike_au/WCNSS_qcom_cfg_qca6390.ini b/sdmshrike_au/WCNSS_qcom_cfg_qca6390.ini
index facd21b3d13dba67177597cb14f00431f262f1e2..22be1cb5d5c40425908d4189371d671ac56d027c 100644
--- a/sdmshrike_au/WCNSS_qcom_cfg_qca6390.ini
+++ b/sdmshrike_au/WCNSS_qcom_cfg_qca6390.ini
@@ -492,7 +492,7 @@ gEnableSNRMonitoring=1
 #Set STA+SAP SCC dfs master support
 g_sta_sap_scc_on_dfs_chan=2
 
-gInterfaceChangeWait=0
+gInterfaceChangeWait=20
 spectral_disable=1
 
 END
diff --git a/sdmshrike_au/WCNSS_qcom_cfg_qcn7605.ini b/sdmshrike_au/WCNSS_qcom_cfg_qcn7605.ini
index 10aa591133a82fab9e077b3c4a95ce5e68fc5402..f8df50481e271e1940f9964c1e6d7943297092e7 100644
--- a/sdmshrike_au/WCNSS_qcom_cfg_qcn7605.ini
+++ b/sdmshrike_au/WCNSS_qcom_cfg_qcn7605.ini
@@ -469,7 +469,7 @@ gEnableLPRx=0
 # Set WMI Credit
 gWmiCreditCount=1
 
-gInterfaceChangeWait=500000
+gInterfaceChangeWait=20
 gBpfFilterEnable=0
 gActiveMcBcBpfMode=0 
 gSoftApMaxPeers=10
diff --git a/sm6150_au/WCNSS_qcom_cfg_qca6174.ini b/sm6150_au/WCNSS_qcom_cfg_qca6174.ini
index c7894a3efbf23c9d368cc6e1f81eb0441bfdef16..e9c71443eb47e30851f9cb927074ba1b475ff404 100644
--- a/sm6150_au/WCNSS_qcom_cfg_qca6174.ini
+++ b/sm6150_au/WCNSS_qcom_cfg_qca6174.ini
@@ -484,6 +484,8 @@ TxLbwFlowHighWaterMarkOffset=50
 # Enable orphan for TCP TX
 gEnableTxOrphan=1
 
+gInterfaceChangeWait=20
+
 END
 
 # Note: Configuration parser would not read anything past the END marker
diff --git a/sm6150_au/WCNSS_qcom_cfg_qca6390.ini b/sm6150_au/WCNSS_qcom_cfg_qca6390.ini
index cebe0156b4f9107b9fb3357f1dd9b8573bd721d2..e00c5f1733addc161bd150e081394a9d495d051e 100644
--- a/sm6150_au/WCNSS_qcom_cfg_qca6390.ini
+++ b/sm6150_au/WCNSS_qcom_cfg_qca6390.ini
@@ -492,7 +492,7 @@ gEnableSNRMonitoring=1
 #Set STA+SAP SCC dfs master support
 g_sta_sap_scc_on_dfs_chan=2
 
-gInterfaceChangeWait=0
+gInterfaceChangeWait=20
 spectral_disable=1
 
 gSetAntennaIsolation=30
diff --git a/sm6150_au/WCNSS_qcom_cfg_qcn7605.ini b/sm6150_au/WCNSS_qcom_cfg_qcn7605.ini
index 025fe8c82aaeafdf4a0ea22d09ba8d435c47015d..1c75e75aa3b76378618af304b7968880c8f5c3d3 100644
--- a/sm6150_au/WCNSS_qcom_cfg_qcn7605.ini
+++ b/sm6150_au/WCNSS_qcom_cfg_qcn7605.ini
@@ -469,7 +469,7 @@ gEnableLPRx=0
 # Set WMI Credit
 gWmiCreditCount=1
 
-gInterfaceChangeWait=500000
+gInterfaceChangeWait=20
 gBpfFilterEnable=0
 gActiveMcBcBpfMode=0 
 gSoftApMaxPeers=10