diff --git a/connectivity/FEATURE_BLE/source/cordio/source/PalGapImpl.cpp b/connectivity/FEATURE_BLE/source/cordio/source/PalGapImpl.cpp
index c1e9e2af0ce..eac7ad7710d 100644
--- a/connectivity/FEATURE_BLE/source/cordio/source/PalGapImpl.cpp
+++ b/connectivity/FEATURE_BLE/source/cordio/source/PalGapImpl.cpp
@@ -1209,7 +1209,11 @@ ble_error_t PalGap::periodic_advertising_enable(
 
 uint16_t PalGap::get_maximum_advertising_data_length()
 {
+#if BLE_FEATURE_EXTENDED_ADVERTISING
     return HciGetMaxAdvDataLen();
+#else
+    return HCI_ADV_DATA_LEN;
+#endif // BLE_FEATURE_EXTENDED_ADVERTISING
 }
 
 
diff --git a/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/NRFCordioHCIDriver.cpp b/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/NRFCordioHCIDriver.cpp
index 5a059c33324..7e7a0a0bb94 100644
--- a/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/NRFCordioHCIDriver.cpp
+++ b/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/NRFCordioHCIDriver.cpp
@@ -326,8 +326,10 @@ void NRFCordioHCIDriver::do_terminate()
 
 void NRFCordioHCIDriver::start_reset_sequence()
 {
+#if BLE_FEATURE_EXTENDED_ADVERTISING
     // Make sure extended adv is init
     DmExtAdvInit();
+#endif // BLE_FEATURE_EXTENDED_ADVERTISING
 
     CordioHCIDriver::start_reset_sequence();
 }