diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5dffdeca..1274dcd72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ---
 
 ## Unreleased
+
 ### Added
 - GAP: simulate HCI_EVENT_REMOTE_NAME_REQUEST_COMPLETE if HCI Remote Name Request fails 
 - AVRCP Controller: Added send generic PASS THROUGH command
@@ -16,6 +17,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Fixed
 - GAP: store link key for standard/non-SSP pairing
 - BENP: emit channel opened with ERROR_CODE_REMOTE_USER_TERMINATED_CONNECTION if connection cannot be set up
+
 ### Changed
 - BTstack HID: remove HID_PROTOCOL_MODE_REPORT_WITH_FALLBACK_TO_BOOT
 
diff --git a/src/hci.c b/src/hci.c
index e28979d81..dc985efe0 100644
--- a/src/hci.c
+++ b/src/hci.c
@@ -571,7 +571,7 @@ void gap_drop_link_key_for_bd_addr(bd_addr_t addr){
         // reset link key stored in connection
         conn->link_key_type = INVALID_LINK_KEY;
     }
-    if (!hci_stack->link_key_db) {
+    if (hci_stack->link_key_db != NULL) {
         hci_stack->link_key_db->delete_link_key(addr);
     }
 }