diff --git a/bta/gatt/bta_gattc_int.h b/bta/gatt/bta_gattc_int.h
index 118b906..d3cff47 100644
--- a/bta/gatt/bta_gattc_int.h
+++ b/bta/gatt/bta_gattc_int.h
@@ -75,7 +75,7 @@
 
 /* max client application GATTC can support */
 #ifndef     BTA_GATTC_CL_MAX
-#define     BTA_GATTC_CL_MAX    10
+#define     BTA_GATTC_CL_MAX    32
 #endif
 
 /* max known devices GATTC can support */
diff --git a/stack/btm/btm_ble_gap.c b/stack/btm/btm_ble_gap.c
index 12385a7..7cef5f2 100644
--- a/stack/btm/btm_ble_gap.c
+++ b/stack/btm/btm_ble_gap.c
@@ -363,6 +363,14 @@
 BOOLEAN BTM_BleUpdateBgConnDev(BOOLEAN add_remove, BD_ADDR   remote_bda)
 {
     BOOLEAN ret = TRUE;
+    UINT8   dev_wl_type = BTM_BLE_WL_INIT;
+
+    BTM_TRACE_EVENT0 (" BTM_BleUpdateBgConnDev");
+
+    /* update white list */
+    ret = btm_update_bg_conn_list(add_remove, remote_bda, &dev_wl_type);
+
+    btm_update_dev_to_white_list(add_remove, remote_bda, dev_wl_type);
 
     return ret;
 }