diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 5867c1c3f4367253386691482286a1c21b074ae6..0c0dd1b52b66dea23abb90883565d0326564e214 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -1175,7 +1175,7 @@ int smp_distribute_keys(struct l2cap_conn *conn, __u8 force)
 		*keydist &= ~SMP_DIST_SIGN;
 	}
 
-	if (conn->hcon->out || force) {
+	if (conn->hcon->out || force || !(rsp->init_key_dist & 0x07)) {
 		clear_bit(HCI_CONN_LE_SMP_PEND, &conn->hcon->flags);
 		cancel_delayed_work_sync(&conn->security_timer);
 		smp_chan_destroy(conn);