diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_discovery.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_discovery.cpp
index fdf0ec76ca..a93a27c32e 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_discovery.cpp
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_discovery.cpp
@@ -87,12 +87,13 @@ void bleGattcEventHandler(const ble_evt_t *p_ble_evt)
             break;
 
         case BLE_GATTC_EVT_HVX: {
-                GattHVXCallbackParams params;
-                /* params.connHandle = */ p_ble_evt->evt.gattc_evt.conn_handle;
-                /* params.handle     = */ p_ble_evt->evt.gattc_evt.params.hvx.handle;
-                /* params.type       = */ static_cast<HVXType_t>(p_ble_evt->evt.gattc_evt.params.hvx.type);
-                /* params.len        = */ p_ble_evt->evt.gattc_evt.params.hvx.len;
-                /* params.data       = */ p_ble_evt->evt.gattc_evt.params.hvx.data;
+                GattHVXCallbackParams params = {
+                    /* connHandle = */ p_ble_evt->evt.gattc_evt.conn_handle,
+                    /* handle     = */ p_ble_evt->evt.gattc_evt.params.hvx.handle,
+                    /* type       = */ static_cast<HVXType_t>(p_ble_evt->evt.gattc_evt.params.hvx.type),
+                    /* len        = */ p_ble_evt->evt.gattc_evt.params.hvx.len,
+                    /* data       = */ p_ble_evt->evt.gattc_evt.params.hvx.data
+                };
 
                 gattClient.processHVXEvent(&params);
             }
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle_discovery.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle_discovery.cpp
index 8090e8498b..5f7c899ae9 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle_discovery.cpp
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle_discovery.cpp
@@ -87,12 +87,13 @@ void bleGattcEventHandler(const ble_evt_t *p_ble_evt)
             break;
 
         case BLE_GATTC_EVT_HVX: {
-                GattHVXCallbackParams params;
-                /* params.connHandle = */ p_ble_evt->evt.gattc_evt.conn_handle;
-                /* params.handle     = */ p_ble_evt->evt.gattc_evt.params.hvx.handle;
-                /* params.type       = */ static_cast<HVXType_t>(p_ble_evt->evt.gattc_evt.params.hvx.type);
-                /* params.len        = */ p_ble_evt->evt.gattc_evt.params.hvx.len;
-                /* params.data       = */ p_ble_evt->evt.gattc_evt.params.hvx.data;
+                GattHVXCallbackParams params = {
+                    /* connHandle = */ p_ble_evt->evt.gattc_evt.conn_handle,
+                    /* handle     = */ p_ble_evt->evt.gattc_evt.params.hvx.handle,
+                    /* type       = */ static_cast<HVXType_t>(p_ble_evt->evt.gattc_evt.params.hvx.type),
+                    /* len        = */ p_ble_evt->evt.gattc_evt.params.hvx.len,
+                    /* data       = */ p_ble_evt->evt.gattc_evt.params.hvx.data
+                };
 
                 gattClient.processHVXEvent(&params);
             }