diff --git a/Kbuild b/Kbuild
index d439762d7a48..c512c88f17c8 100644
--- a/Kbuild
+++ b/Kbuild
@@ -1635,7 +1635,6 @@ endif
 
 ifeq (y,$(filter y,$(CONFIG_CNSS_EOS) $(CONFIG_ICNSS)))
 CDEFINES += -DQCA_WIFI_3_0
-CDEFINES += -DQCA_WIFI_3_0_EMU
 endif
 
 ifeq (y,$(filter y,$(CONFIG_CNSS_ADRASTEA) $(CONFIG_ICNSS)))
diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c
index 04ff47afc700..61e26e5c5746 100644
--- a/core/dp/txrx/ol_txrx.c
+++ b/core/dp/txrx/ol_txrx.c
@@ -3621,7 +3621,7 @@ static QDF_STATUS ol_txrx_wait_for_pending_tx(int timeout)
 }
 
 #ifndef QCA_WIFI_3_0_EMU
-#define SUSPEND_DRAIN_WAIT 500
+#define SUSPEND_DRAIN_WAIT 1000
 #else
 #define SUSPEND_DRAIN_WAIT 3000
 #endif