diff --git a/features/FEATURE_BLE/source/generic/GenericGap.tpp b/features/FEATURE_BLE/source/generic/GenericGap.tpp
index 1009552105..3c991ecd23 100644
--- a/features/FEATURE_BLE/source/generic/GenericGap.tpp
+++ b/features/FEATURE_BLE/source/generic/GenericGap.tpp
@@ -1424,6 +1424,17 @@ ble_error_t GenericGap<PalGapImpl, PalSecurityManager, ConnectionEventMonitorEve
         return err;
     }
 
+#if defined(TARGET_CORDIO_LL)
+    // TODO: fix advertising set creation in the link layer.
+    // The Cordio link layer implements legacy API on top of extended advertising
+    // and has an issue that no advertising set is created until we set parameters.
+    // As a workaround, set advertising data again to ensure it takes effect.
+    err = setAdvertisingData_(this->_advPayload, this->_scanResponse);
+    if (err) {
+        return err;
+    }
+#endif
+
     err = _pal_gap.advertising_enable(true);
     if (err) {
         return err;