diff --git a/features/FEATURE_BLE/source/generic/GenericGap.cpp b/features/FEATURE_BLE/source/generic/GenericGap.cpp
index 093d2d1cdf..28a073f009 100644
--- a/features/FEATURE_BLE/source/generic/GenericGap.cpp
+++ b/features/FEATURE_BLE/source/generic/GenericGap.cpp
@@ -432,7 +432,12 @@ GenericGap::GenericGap(
 
     _pal_gap.set_event_handler(this);
 
-    // FIXME: lazy initialization of the legacy advertising set
+    if (is_extended_advertising_available()) {
+        setExtendedAdvertisingParameters(
+            LEGACY_ADVERTISING_HANDLE,
+            GapAdvertisingParameters()
+        );
+    }
 }
 
 GenericGap::~GenericGap()