diff --git a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_2/BlueNrg2HCIDriver.cpp b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_2/BlueNrg2HCIDriver.cpp
index acc93467340..1800de7e1cf 100644
--- a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_2/BlueNrg2HCIDriver.cpp
+++ b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_2/BlueNrg2HCIDriver.cpp
@@ -60,7 +60,11 @@
 #define RANDOM_STATIC_ADDRESS_OFFSET    0x80
 #define LL_WITHOUT_HOST_OFFSET          0x2C
 
+#ifdef NDEBUG
 #define SPI_STACK_SIZE                  1024
+#else
+#define SPI_STACK_SIZE                  2048
+#endif
 
 #define IRQ_TIMEOUT_DURATION            100 //ms