diff --git a/nimble/host/store/config/src/ble_store_nvs.c b/nimble/host/store/config/src/ble_store_nvs.c
index 6a72e667a..6ee027b43 100644
--- a/nimble/host/store/config/src/ble_store_nvs.c
+++ b/nimble/host/store/config/src/ble_store_nvs.c
@@ -490,6 +490,11 @@ int ble_store_config_persist_cccds(void)
     union ble_store_value val;
 
     nvs_count = get_nvs_db_attribute(BLE_STORE_OBJ_TYPE_CCCD, 0, NULL, 0);
+    if (nvs_count == -1) {
+        ESP_LOGE(TAG, "NVS operation failed while persisting CCCD");
+        return BLE_HS_ESTORE_FAIL;
+    }
+
     if (nvs_count < ble_store_config_num_cccds) {
 
         /* NVS db count less than RAM count, write operation */
@@ -516,6 +521,11 @@ int ble_store_config_persist_peer_secs(void)
     union ble_store_value val;
 
     nvs_count = get_nvs_db_attribute(BLE_STORE_OBJ_TYPE_PEER_SEC, 0, NULL, 0);
+    if (nvs_count == -1) {
+        ESP_LOGE(TAG, "NVS operation failed while persisting peer sec");
+        return BLE_HS_ESTORE_FAIL;
+    }
+
     if (nvs_count < ble_store_config_num_peer_secs) {
 
         /* NVS db count less than RAM count, write operation */
@@ -542,6 +552,11 @@ int ble_store_config_persist_our_secs(void)
     union ble_store_value val;
 
     nvs_count = get_nvs_db_attribute(BLE_STORE_OBJ_TYPE_OUR_SEC, 0, NULL, 0);
+    if (nvs_count == -1) {
+        ESP_LOGE(TAG, "NVS operation failed while persisting our sec");
+        return BLE_HS_ESTORE_FAIL;
+    }
+
     if (nvs_count < ble_store_config_num_our_secs) {
 
         /* NVS db count less than RAM count, write operation */
@@ -571,7 +586,13 @@ int ble_store_persist_peer_records(void)
     struct ble_hs_dev_records *peer_dev_rec = ble_rpa_get_peer_dev_records();
 
     nvs_count = get_nvs_db_attribute(BLE_STORE_OBJ_TYPE_PEER_DEV_REC, 0, NULL, 0);
+    if (nvs_count == -1) {
+        ESP_LOGE(TAG, "NVS operation failed while persisting peer_dev_rec");
+        return BLE_HS_ESTORE_FAIL;
+    }
+
     if (nvs_count < ble_store_num_peer_dev_rec) {
+
         /* NVS db count less than RAM count, write operation */
         ESP_LOGD(TAG, "Persisting peer dev record to NVS...");
         peer_rec = peer_dev_rec[ble_store_num_peer_dev_rec - 1];