diff --git a/CHANGELOG.md b/CHANGELOG.md
index b105dd057..f8909caa0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,13 +33,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - A2DP Source: `ENABLE_A2DP_SOURCE_EXPLICIT_CONFIG` disables auto config. Requires call to `a2dp_source_set_config_{CODEC}'
 
 ### Fixed
-- HCI: handle start inquiry failure
-- AVRCP Target: fix notification changed event
-- HFP: Emit Audio Connection Released on SLC Release, e.g. remote power off
 - GAP: calculate IO Cap AuthReq Bondable Mode based on `gap_ssp_set_authentication_requirement` and `gap_set_bondable_mode`
 - GAP: only store link key for ssp if remote side has set bondable in io cap auth requirements as well 
 - GAP: allow to disable link supervision timeout
 - GAP: fix `gap_connect` after `gap_connect_cancel` 
+- HCI: handle start inquiry failure
+- L2CAP: fix create outgoing connection triggered in hci disconnect event callback
+- AVRCP Target: fix notification changed event
+- HFP: Emit Audio Connection Released on SLC Release, e.g. remote power off
 - HFP HF: only emit single event for RING and AG Status updates
 - HFP AG: fix audio connection setup for in-band ringtone on incoming connection
 - HFP: fix audio connection setup by HF if codec negotiation is supported
diff --git a/src/l2cap.c b/src/l2cap.c
index 5a69f8e8f..7e6c231dc 100644
--- a/src/l2cap.c
+++ b/src/l2cap.c
@@ -2056,7 +2056,7 @@ uint8_t l2cap_create_channel(btstack_packet_handler_t channel_packet_handler, bd
 
     // check if hci connection is already usable,
     hci_connection_t * conn = hci_connection_for_bd_addr_and_type(address, BD_ADDR_TYPE_ACL);
-    if (conn && conn->con_handle != HCI_CON_HANDLE_INVALID){
+    if (conn && conn->state == OPEN){
     	// simulate connection complete
 	    l2cap_handle_connection_complete(conn->con_handle, channel);