diff --git a/components/esp_hw_support/modem/port/esp32s31/modem_clock_impl.c b/components/esp_hw_support/modem/port/esp32s31/modem_clock_impl.c
index b9ffc7c7b5a..1958188e67b 100644
--- a/components/esp_hw_support/modem/port/esp32s31/modem_clock_impl.c
+++ b/components/esp_hw_support/modem/port/esp32s31/modem_clock_impl.c
@@ -21,7 +21,11 @@
 #define MODEM_ADC_COMMON_FE_CLOCK_DEPS      ( MODEM_CLOCKS( MODEM_ADC_COMMON_FE ) )
 #define PHY_CALIBRATION_WIFI_CLOCK_DEPS     ( MODEM_CLOCKS( WIFI_APB, WIFI_BB, WIFI_BB_44M, WIFI_BB_80X1 ) )
 #define PHY_CALIBRATION_BT_I154_CLOCK_DEPS  ( MODEM_CLOCKS( WIFI_APB, WIFI_BB_44M, BT_I154_COMMON_BB ) )
+#if SOC_BT_SUPPORTED //TODO IDF-15185: Remove this once BT is supported
 #define PHY_CALIBRATION_CLOCK_DEPS          ( PHY_CALIBRATION_WIFI_CLOCK_DEPS | PHY_CALIBRATION_BT_I154_CLOCK_DEPS )
+#else
+#define PHY_CALIBRATION_CLOCK_DEPS          ( PHY_CALIBRATION_WIFI_CLOCK_DEPS )
+#endif
 
 uint32_t IRAM_ATTR modem_clock_get_module_deps(shared_periph_module_t module)
 {
diff --git a/components/esp_phy/esp32s31/include/phy_init_deps.h b/components/esp_phy/esp32s31/include/phy_init_deps.h
index caba288e465..58a5eaa763b 100644
--- a/components/esp_phy/esp32s31/include/phy_init_deps.h
+++ b/components/esp_phy/esp32s31/include/phy_init_deps.h
@@ -6,4 +6,4 @@
 
 #pragma once
 
-#define PHY_INIT_MODEM_CLOCK_REQUIRED_BITS  0x3BE7FF
+#define PHY_INIT_MODEM_CLOCK_REQUIRED_BITS  0x38E7FF