diff --git a/platform/posix/le_device_db_fs.c b/platform/posix/le_device_db_fs.c
index 3473a85f3..2d6d36421 100644
--- a/platform/posix/le_device_db_fs.c
+++ b/platform/posix/le_device_db_fs.c
@@ -72,11 +72,25 @@ typedef struct le_device_memory_db {
 
 #define LE_DEVICE_MEMORY_SIZE 20
 #define INVALID_ENTRY_ADDR_TYPE 0xff
-const char * db_path = "/tmp/btstack_le_device_db.txt";
-const char * csv_header = "# addr_type, addr, irk, ltk, ediv, rand[8], key_size, authenticated, authorized, remote_csrk, remote_counter, local_csrk, local_counter";
+#define DB_PATH_TEMPLATE "/tmp/btstack_at_%s_le_device_db.txt"
+const  char * csv_header = "# addr_type, addr, irk, ltk, ediv, rand[8], key_size, authenticated, authorized, remote_csrk, remote_counter, local_csrk, local_counter";
+static char db_path[sizeof(DB_PATH_TEMPLATE) - 2 + 17 + 1];
 
 static le_device_memory_db_t le_devices[LE_DEVICE_MEMORY_SIZE];
 
+static char bd_addr_to_dash_str_buffer[6*3];  // 12-45-78-01-34-67\0
+static char * bd_addr_to_dash_str(bd_addr_t addr){
+    char * p = bd_addr_to_dash_str_buffer;
+    int i;
+    for (i = 0; i < 6 ; i++) {
+        *p++ = char_for_nibble((addr[i] >> 4) & 0x0F);
+        *p++ = char_for_nibble((addr[i] >> 0) & 0x0F);
+        *p++ = '-';
+    }
+    *--p = 0;
+    return (char *) bd_addr_to_dash_str_buffer;
+}
+
 static inline void write_delimiter(FILE * wFile){
     fwrite(", ", 1, 1, wFile);
 }
@@ -208,6 +222,12 @@ void le_device_db_init(void){
     for (i=0;i<LE_DEVICE_MEMORY_SIZE;i++){
         le_devices[i].addr_type = INVALID_ENTRY_ADDR_TYPE;
     }
+    sprintf(db_path, DB_PATH_TEMPLATE, "00-00-00-00-00-00");
+}
+
+void le_device_db_set_local_bd_addr(bd_addr_t addr){
+    sprintf(db_path, DB_PATH_TEMPLATE, bd_addr_to_dash_str(addr));
+    log_info("le_device_db_fs: path %s", db_path);
     le_device_db_read();
     le_device_db_dump();
 }
diff --git a/src/ble/le_device_db.h b/src/ble/le_device_db.h
index 5e2117499..285d55721 100644
--- a/src/ble/le_device_db.h
+++ b/src/ble/le_device_db.h
@@ -67,6 +67,13 @@ extern "C" {
  */
 void le_device_db_init(void);
 
+
+/**
+ * @brief sets local bd addr. allows for db per Bluetooth controller
+ * @param bd_addr
+ */
+void le_device_db_set_local_bd_addr(bd_addr_t bd_addr);
+
 /**
  * @brief add device to db
  * @param addr_type, address of the device
diff --git a/src/ble/le_device_db_memory.c b/src/ble/le_device_db_memory.c
index 61e5540cb..822364f2e 100644
--- a/src/ble/le_device_db_memory.c
+++ b/src/ble/le_device_db_memory.c
@@ -82,6 +82,9 @@ void le_device_db_init(void){
     }
 }
 
+void le_device_db_set_local_bd_addr(bd_addr_t bd_addr){
+}
+
 // @returns number of device in db
 int le_device_db_count(void){
     int i;
diff --git a/src/ble/sm.c b/src/ble/sm.c
index 213ef81de..7ea8255d5 100644
--- a/src/ble/sm.c
+++ b/src/ble/sm.c
@@ -2818,6 +2818,12 @@ static void sm_event_packet_handler (uint8_t packet_type, uint16_t channel, uint
 					// bt stack activated, get started
 					if (btstack_event_state_get_state(packet) == HCI_STATE_WORKING){
                         log_info("HCI Working!");
+
+                        // set local addr for le device db
+                        bd_addr_t local_bd_addr;
+                        gap_local_bd_addr(local_bd_addr);
+                        le_device_db_set_local_bd_addr(local_bd_addr);
+
                         dkg_state = sm_persistent_irk_ready ? DKG_CALC_DHK : DKG_CALC_IRK;
                         rau_state = RAU_IDLE;
 #ifdef USE_MBEDTLS_FOR_ECDH