diff --git a/features/FEATURE_BLE/ble/Gap.h b/features/FEATURE_BLE/ble/Gap.h
index c87f82774d..17abea4441 100644
--- a/features/FEATURE_BLE/ble/Gap.h
+++ b/features/FEATURE_BLE/ble/Gap.h
@@ -2186,7 +2186,7 @@ public:
      * @return BLE_ERROR_NONE in case of success or an appropriate error code.
      */
     virtual ble_error_t setPeripheralPrivacyConfiguration(
-        const PeripheralPrivacyConfiguration_t &configuration
+        const PeripheralPrivacyConfiguration_t *configuration
     ) {
         return BLE_ERROR_NOT_IMPLEMENTED;
     }
@@ -2200,7 +2200,7 @@ public:
      * @return BLE_ERROR_NONE in case of success or an appropriate error code.
      */
     virtual ble_error_t getPeripheralPrivacyConfiguration(
-        PeripheralPrivacyConfiguration_t &configuration
+        PeripheralPrivacyConfiguration_t *configuration
     ) {
         return BLE_ERROR_NOT_IMPLEMENTED;
     }
@@ -2213,7 +2213,7 @@ public:
      * @return BLE_ERROR_NONE in case of success or an appropriate error code.
      */
     virtual ble_error_t setCentralPrivacyConfiguration(
-        const CentralPrivacyConfiguration_t &configuration
+        const CentralPrivacyConfiguration_t *configuration
     ) {
         return BLE_ERROR_NOT_IMPLEMENTED;
     }
@@ -2227,7 +2227,7 @@ public:
      * @return BLE_ERROR_NONE in case of success or an appropriate error code.
      */
     virtual ble_error_t getCentralPrivacyConfiguration(
-        CentralPrivacyConfiguration_t &configuration
+        CentralPrivacyConfiguration_t *configuration
     ) {
         return BLE_ERROR_NOT_IMPLEMENTED;
     }
diff --git a/features/FEATURE_BLE/source/Gap.cpp b/features/FEATURE_BLE/source/Gap.cpp
index c25be9fd4e..3793c0c46c 100644
--- a/features/FEATURE_BLE/source/Gap.cpp
+++ b/features/FEATURE_BLE/source/Gap.cpp
@@ -16,8 +16,10 @@
 
 #include "ble/Gap.h"
 
-ble_error_t Gap::getRandomAddressType(BLEProtocol::AddressBytes_t address, RandomAddressType_t& type)
-{
+ble_error_t Gap::getRandomAddressType(
+    BLEProtocol::AddressBytes_t address,
+    RandomAddressType_t* type
+) {
     // see section Device address in Bluetooth Link Layer specification
     // (Vol 6 - Part B)
     switch (address[5] >> 6) {