diff --git a/src/hci.c b/src/hci.c
index 248e9b30d..cd662b952 100644
--- a/src/hci.c
+++ b/src/hci.c
@@ -454,6 +454,16 @@ int hci_le_supported(void){
 #endif    
 }
 
+// get addr type and address used in advertisement packets
+void hci_le_advertisement_address(int * addr_type, bd_addr_t * addr){
+    *addr_type = hci_stack.adv_addr_type;
+    if (hci_stack.adv_addr_type){
+        memcpy(addr, hci_stack.adv_address, 6);
+    } else {
+        memcpy(addr, hci_stack.local_bd_addr, 6);
+    }
+}
+
 // avoid huge local variables
 #ifndef EMBEDDED
 static device_name_t device_name;
@@ -845,6 +855,10 @@ void hci_init(hci_transport_t *transport, void *config, bt_control_t *control, r
     hci_stack.ssp_io_capability = SSP_IO_CAPABILITY_NO_INPUT_NO_OUTPUT;
     hci_stack.ssp_authentication_requirement = 0;
     hci_stack.ssp_auto_accept = 1;
+
+    // LE
+    hci_stack.adv_addr_type = 0;
+    memset(hci_stack.adv_address, 0, 6);
 }
 
 void hci_close(){
@@ -1469,6 +1483,16 @@ int hci_send_cmd_packet(uint8_t *packet, int size){
         }
     }
     
+#ifdef HAVE_BLE
+    if (IS_COMMAND(packet, hci_le_set_advertising_parameters)){
+        hci_stack.adv_addr_type = packet[8];
+    }
+    if (IS_COMMAND(packet, hci_le_set_random_address)){
+        bt_flip_addr(hci_stack.adv_address, &packet[3]);
+    }
+#endif
+
+
     hci_stack.num_cmd_packets--;
     return hci_stack.hci_transport->send_packet(HCI_COMMAND_DATA_PACKET, packet, size);
 }
diff --git a/src/hci.h b/src/hci.h
index e79006d4b..531ea94fa 100644
--- a/src/hci.h
+++ b/src/hci.h
@@ -329,6 +329,9 @@ typedef struct {
     uint8_t   decline_reason;
     bd_addr_t decline_addr;
 
+    uint8_t   adv_addr_type;
+    bd_addr_t adv_address;
+
 } hci_stack_t;
 
 // create and send hci command packets based on a template and a list of parameters
@@ -408,6 +411,9 @@ void hci_ssp_set_authentication_requirement(int authentication_requirement);
 // if set, BTstack will confirm a numberic comparion and enter '000000' if requested
 void hci_ssp_set_auto_accept(int auto_accept);
 
+// get addr type and address used in advertisement packets
+void hci_le_advertisement_address(int * addr_type, bd_addr_t * addr);
+
 #if defined __cplusplus
 }
 #endif