diff --git a/nimble/host/src/ble_att.c b/nimble/host/src/ble_att.c
index 8261e09e7..774444ab0 100644
--- a/nimble/host/src/ble_att.c
+++ b/nimble/host/src/ble_att.c
@@ -471,7 +471,7 @@ ble_att_rx(struct ble_l2cap_chan *chan)
     int rc;
 
     conn_handle = ble_l2cap_get_conn_handle(chan);
-    if (!conn_handle) {
+    if (conn_handle == BLE_HS_CONN_HANDLE_NONE) {
         return BLE_HS_ENOTCONN;
     }
 
diff --git a/nimble/host/src/ble_l2cap.c b/nimble/host/src/ble_l2cap.c
index 1c7e27a2a..883bde78a 100644
--- a/nimble/host/src/ble_l2cap.c
+++ b/nimble/host/src/ble_l2cap.c
@@ -135,7 +135,7 @@ uint16_t
 ble_l2cap_get_conn_handle(struct ble_l2cap_chan *chan)
 {
     if (!chan) {
-        return 0;
+        return BLE_HS_CONN_HANDLE_NONE;
     }
 
     return chan->conn_handle;
diff --git a/nimble/host/src/ble_sm.c b/nimble/host/src/ble_sm.c
index 205b05f9a..e53b4ff1a 100644
--- a/nimble/host/src/ble_sm.c
+++ b/nimble/host/src/ble_sm.c
@@ -2565,7 +2565,7 @@ ble_sm_rx(struct ble_l2cap_chan *chan)
     STATS_INC(ble_l2cap_stats, sm_rx);
 
     conn_handle = ble_l2cap_get_conn_handle(chan);
-    if (!conn_handle) {
+    if (conn_handle == BLE_HS_CONN_HANDLE_NONE) {
         return BLE_HS_ENOTCONN;
     }