diff --git a/features/FEATURE_BLE/ble/Gap.h b/features/FEATURE_BLE/ble/Gap.h
index 91b974936f..da906b9bed 100644
--- a/features/FEATURE_BLE/ble/Gap.h
+++ b/features/FEATURE_BLE/ble/Gap.h
@@ -408,7 +408,7 @@ public:
         CENTRAL = 0x2,
     };
 
-#if BLE_ROLE_BROADCASTER
+#if BLE_ROLE_OBSERVER
     /**
      * Representation of a scanned advertising packet.
      *
@@ -483,7 +483,7 @@ public:
      */
     typedef FunctionPointerWithContext<const AdvertisementCallbackParams_t *>
         AdvertisementReportCallback_t;
-#endif // BLE_ROLE_BROADCASTER
+#endif // BLE_ROLE_OBSERVER
 
 #if BLE_FEATURE_CONNECTABLE
     /**
diff --git a/features/FEATURE_BLE/mbed_lib.json b/features/FEATURE_BLE/mbed_lib.json
index fc904ba48f..a8dcbf6903 100644
--- a/features/FEATURE_BLE/mbed_lib.json
+++ b/features/FEATURE_BLE/mbed_lib.json
@@ -3,12 +3,12 @@
 	"config": {
 	    "ble-feature-observer": {
 	        "help": "Include observer BLE role support, allows listening for and processing advertising packets.",
-	        "value": false,
+	        "value": true,
 	        "macro_name": "BLE_ROLE_OBSERVER"
 	    },
 	    "ble-role-broadcaster": {
 	        "help": "Include broadcaster BLE role support, allows sending advertising packets.",
-	        "value": true,
+	        "value": false,
 	        "macro_name": "BLE_ROLE_BROADCASTER"
 	    },
 	    "ble-role-peripheral": {
diff --git a/features/FEATURE_BLE/source/LegacyGap.tpp b/features/FEATURE_BLE/source/LegacyGap.tpp
index e1dbf89d34..b938ebb5a6 100644
--- a/features/FEATURE_BLE/source/LegacyGap.tpp
+++ b/features/FEATURE_BLE/source/LegacyGap.tpp
@@ -970,8 +970,10 @@ LegacyGap<Impl>::LegacyGap() :
     , disconnectionCallChain()
 #endif // BLE_FEATURE_CONNECTABLE
 {
+#if BLE_ROLE_BROADCASTER
     _advPayload.clear();
     _scanResponse.clear();
+#endif // BLE_ROLE_BROADCASTER
 }
 
 template<class Impl>
diff --git a/features/FEATURE_BLE/source/generic/GenericGap.tpp b/features/FEATURE_BLE/source/generic/GenericGap.tpp
index 5ffd735555..7087f72baa 100644
--- a/features/FEATURE_BLE/source/generic/GenericGap.tpp
+++ b/features/FEATURE_BLE/source/generic/GenericGap.tpp
@@ -2214,7 +2214,7 @@ void GenericGap<PalGapImpl, PalSecurityManager, ConnectionEventMonitorEventHandl
 template <template<class> class PalGapImpl, class PalSecurityManager, class ConnectionEventMonitorEventHandler>
 const uint8_t GenericGap<PalGapImpl, PalSecurityManager, ConnectionEventMonitorEventHandler>::MAX_ADVERTISING_SETS;
 
-#if BLE_ROLE_OBSERVER
+#if BLE_ROLE_BROADCASTER
 template <template<class> class PalGapImpl, class PalSecurityManager, class ConnectionEventMonitorEventHandler>
 uint8_t GenericGap<PalGapImpl, PalSecurityManager, ConnectionEventMonitorEventHandler>::getMaxAdvertisingSetNumber_()
 {
@@ -2894,7 +2894,7 @@ bool GenericGap<PalGapImpl, PalSecurityManager, ConnectionEventMonitorEventHandl
     return _active_periodic_sets.get(handle);
 }
 #endif // BLE_FEATURE_PERIODIC_ADVERTISING
-#endif // BLE_ROLE_OBSERVER
+#endif // BLE_ROLE_BROADCASTER
 
 #if BLE_FEATURE_CONNECTABLE
 template <template<class> class PalGapImpl, class PalSecurityManager, class ConnectionEventMonitorEventHandler>