diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt
index c274809f0e1..57fcfc8b31d 100644
--- a/drivers/wifi/nrfwifi/CMakeLists.txt
+++ b/drivers/wifi/nrfwifi/CMakeLists.txt
@@ -301,8 +301,16 @@ zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_FEAT_KEEPALIVE
   -DNRF_WIFI_KEEPALIVE_PERIOD_S=${CONFIG_NRF_WIFI_KEEPALIVE_PERIOD_S}
 )
 
+zephyr_compile_definitions_ifdef(CONFIG_NRF70_OFFLOADED_RAW_TX
+  -DNRF_NRF70_OFFLOADED_RAW_TX
+)
+
+zephyr_compile_definitions_ifdef(CONFIG_NRF70_PASSIVE_SCAN_ONLY
+  -DNRF70_PASSIVE_SCAN_ONLY
+)
+
 zephyr_compile_definitions_ifdef(CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS
-  -DWIFI_MGMT_RAW_SCAN_RESULTS=${CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS}
+  -DWIFI_MGMT_RAW_SCAN_RESULTS
 )
 
 zephyr_compile_definitions(
@@ -347,6 +355,4 @@ zephyr_compile_definitions(
   -DNRF70_ANT_GAIN_5G_BAND3=${CONFIG_NRF70_ANT_GAIN_5G_BAND3}
   -DNRF_WIFI_PS_INT_PS=${CONFIG_NRF_WIFI_PS_INT_PS}
   -DNRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS=${CONFIG_NRF_WIFI_RPU_RECOVERY_PS_ACTIVE_TIMEOUT_MS}
-  -DNRF_NRF70_OFFLOADED_RAW_TX=${CONFIG_NRF70_OFFLOADED_RAW_TX}
-  -DNRF70_PASSIVE_SCAN_ONLY=${CONFIG_NRF70_PASSIVE_SCAN_ONLY}
 )
diff --git a/drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c b/drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c
index 46c92def8f7..754fe149713 100644
--- a/drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c
+++ b/drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c
@@ -125,7 +125,10 @@ BUILD_ASSERT(QSPI_IF_DEVICE_FREQUENCY >= (NRF_QSPI_BASE_CLOCK_FREQ / 16),
  * starts. It was measured with a logic analyzer (unfortunately, the nRF5340
  * specification does not provide any numbers in this regard).
  */
-#define BASE_CLOCK_SWITCH_DELAY_US 7
+/* FIXME: This has adverse impact on performance, ~3Mbps, so, for now, it is
+ * disabled till further investigation.
+ */
+#define BASE_CLOCK_SWITCH_DELAY_US 0
 
 #else
 /*