diff --git a/features/FEATURE_BLE/targets/TARGET_CORDIO_ODIN_W2/HCIDriver.cpp b/features/FEATURE_BLE/targets/TARGET_CORDIO_ODIN_W2/HCIDriver.cpp
index d49198a304..5e94c19481 100644
--- a/features/FEATURE_BLE/targets/TARGET_CORDIO_ODIN_W2/HCIDriver.cpp
+++ b/features/FEATURE_BLE/targets/TARGET_CORDIO_ODIN_W2/HCIDriver.cpp
@@ -341,10 +341,7 @@ void ble::vendor::odin_w2::HCIDriver::handle_reset_sequence(uint8_t *pMsg)
                     memcpy(addr, pMsg, sizeof(addr));
                     DM_RAND_ADDR_SET(addr, DM_RAND_ADDR_STATIC);
                     // note: will invoke set rand address
-                    cordio::BLE::deviceInstance().getGap().setAddress(
-                        BLEProtocol::AddressType::RANDOM_STATIC,
-                        addr
-                    );
+                    set_random_static_address(addr);
                 }
                 break;
 
diff --git a/features/FEATURE_BLE/targets/TARGET_Cypress/COMPONENT_CYW43XXX/HCIDriver.cpp b/features/FEATURE_BLE/targets/TARGET_Cypress/COMPONENT_CYW43XXX/HCIDriver.cpp
index e51294df66..a9290bf28e 100644
--- a/features/FEATURE_BLE/targets/TARGET_Cypress/COMPONENT_CYW43XXX/HCIDriver.cpp
+++ b/features/FEATURE_BLE/targets/TARGET_Cypress/COMPONENT_CYW43XXX/HCIDriver.cpp
@@ -301,10 +301,7 @@ public:
                         memcpy(addr, pMsg, sizeof(addr));
                         DM_RAND_ADDR_SET(addr, DM_RAND_ADDR_STATIC);
                         // note: will invoke set rand address
-                        cordio::BLE::deviceInstance().getGap().setAddress(
-                            BLEProtocol::AddressType::RANDOM_STATIC,
-                            addr
-                        );
+                        set_random_static_address(addr);
                     }
                     break;
 
diff --git a/features/FEATURE_BLE/targets/TARGET_STM/TARGET_CYW4343X/HCIDriver.cpp b/features/FEATURE_BLE/targets/TARGET_STM/TARGET_CYW4343X/HCIDriver.cpp
index 545889c914..fca3af9be8 100644
--- a/features/FEATURE_BLE/targets/TARGET_STM/TARGET_CYW4343X/HCIDriver.cpp
+++ b/features/FEATURE_BLE/targets/TARGET_STM/TARGET_CYW4343X/HCIDriver.cpp
@@ -265,10 +265,7 @@ public:
                         memcpy(addr, pMsg, sizeof(addr));
                         DM_RAND_ADDR_SET(addr, DM_RAND_ADDR_STATIC);
                         // note: will invoke set rand address
-                        cordio::BLE::deviceInstance().getGap().setAddress(
-                            BLEProtocol::AddressType::RANDOM_STATIC,
-                            addr
-                        );
+                        set_random_static_address(addr);
                     }
                     break;
 
diff --git a/features/FEATURE_BLE/targets/TARGET_STM/TARGET_STM32WB/HCIDriver.cpp b/features/FEATURE_BLE/targets/TARGET_STM/TARGET_STM32WB/HCIDriver.cpp
index a4e5ca0db5..aca205e542 100644
--- a/features/FEATURE_BLE/targets/TARGET_STM/TARGET_STM32WB/HCIDriver.cpp
+++ b/features/FEATURE_BLE/targets/TARGET_STM/TARGET_STM32WB/HCIDriver.cpp
@@ -313,10 +313,7 @@ public:
                         memcpy(addr, pMsg, sizeof(addr));
                         DM_RAND_ADDR_SET(addr, DM_RAND_ADDR_STATIC);
                         // note: will invoke set rand address
-                        cordio::BLE::deviceInstance().getGap().setAddress(
-                            BLEProtocol::AddressType::RANDOM_STATIC,
-                            addr
-                        );
+                        set_random_static_address(addr);
                     }
                     break;