diff --git a/components/bt/host/nimble/Kconfig.in b/components/bt/host/nimble/Kconfig.in
index 64b64a04a4f..6c0ef3238cc 100644
--- a/components/bt/host/nimble/Kconfig.in
+++ b/components/bt/host/nimble/Kconfig.in
@@ -290,7 +290,7 @@ menu "GAP"
     config BT_NIMBLE_MAX_CCCDS
         int "Maximum number of CCC descriptors to save across reboots"
         default 8
-        depends on BT_NIMBLE_ENABLED && BT_NIMBLE_NVS_PERSIST
+        depends on BT_NIMBLE_ENABLED
         help
             Defines maximum number of CCC descriptors to save
 
diff --git a/components/esp_hid/src/nimble_hidh.c b/components/esp_hid/src/nimble_hidh.c
index 22b08cbc37b..bfbed8eca22 100644
--- a/components/esp_hid/src/nimble_hidh.c
+++ b/components/esp_hid/src/nimble_hidh.c
@@ -957,6 +957,7 @@ esp_hidh_dev_t *esp_ble_hidh_dev_open(uint8_t *bda, uint8_t address_type)
     dev->report_write = esp_ble_hidh_dev_report_write;
     dev->report_read = esp_ble_hidh_dev_report_read;
     dev->dump = esp_ble_hidh_dev_dump;
+    dev->connected = true;
 
     /* perform service discovery and fill the report maps */
     read_device_services(dev);