diff --git a/components/bt/esp_ble_mesh/core/bluedroid_host/adapter.c b/components/bt/esp_ble_mesh/core/bluedroid_host/adapter.c
index 610d19a5b1..e0fc33b484 100644
--- a/components/bt/esp_ble_mesh/core/bluedroid_host/adapter.c
+++ b/components/bt/esp_ble_mesh/core/bluedroid_host/adapter.c
@@ -1,7 +1,7 @@
 /*
  * SPDX-FileCopyrightText: 2017 Nordic Semiconductor ASA
  * SPDX-FileCopyrightText: 2015-2016 Intel Corporation
- * SPDX-FileContributor: 2018-2021 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileContributor: 2018-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -74,7 +74,7 @@ static struct bt_mesh_conn_cb *bt_mesh_gatts_conn_cb;
 static tBTA_GATTS_IF bt_mesh_gatts_if;
 static uint8_t bt_mesh_gatts_addr[BLE_MESH_ADDR_LEN];
 static uint16_t svc_handle, char_handle;
-static future_t *future_mesh;
+static future_t *gatts_future_mesh;
 
 /* Static Functions */
 static struct bt_mesh_gatt_attr *bt_mesh_gatts_find_attr_by_handle(uint16_t handle);
@@ -561,6 +561,9 @@ static void bt_mesh_bta_gatts_cb(tBTA_GATTS_EVT event, tBTA_GATTS *p_data)
     case BTA_GATTS_REG_EVT:
         if (p_data->reg_oper.status == BTA_GATT_OK) {
             bt_mesh_gatts_if = p_data->reg_oper.server_if;
+            future_ready(gatts_future_mesh, FUTURE_SUCCESS);
+        } else {
+            future_ready(gatts_future_mesh, FUTURE_FAIL);
         }
         break;
     case BTA_GATTS_READ_EVT: {
@@ -618,27 +621,27 @@ static void bt_mesh_bta_gatts_cb(tBTA_GATTS_EVT event, tBTA_GATTS *p_data)
         break;
     case BTA_GATTS_CREATE_EVT:
         svc_handle = p_data->create.service_id;
-        BT_DBG("svc_handle %d, future_mesh %p", svc_handle, future_mesh);
-        if (future_mesh != NULL) {
-            future_ready(future_mesh, FUTURE_SUCCESS);
+        BT_DBG("svc_handle %d, gatts_future_mesh %p", svc_handle, gatts_future_mesh);
+        if (gatts_future_mesh != NULL) {
+            future_ready(gatts_future_mesh, FUTURE_SUCCESS);
         }
         break;
     case BTA_GATTS_ADD_INCL_SRVC_EVT:
         svc_handle = p_data->add_result.attr_id;
-        if (future_mesh != NULL) {
-            future_ready(future_mesh, FUTURE_SUCCESS);
+        if (gatts_future_mesh != NULL) {
+            future_ready(gatts_future_mesh, FUTURE_SUCCESS);
         }
         break;
     case BTA_GATTS_ADD_CHAR_EVT:
         char_handle = p_data->add_result.attr_id;
-        if (future_mesh != NULL) {
-            future_ready(future_mesh, FUTURE_SUCCESS);
+        if (gatts_future_mesh != NULL) {
+            future_ready(gatts_future_mesh, FUTURE_SUCCESS);
         }
         break;
     case BTA_GATTS_ADD_CHAR_DESCR_EVT:
         char_handle = p_data->add_result.attr_id;
-        if (future_mesh != NULL) {
-            future_ready(future_mesh, FUTURE_SUCCESS);
+        if (gatts_future_mesh != NULL) {
+            future_ready(gatts_future_mesh, FUTURE_SUCCESS);
         }
         break;
     case BTA_GATTS_DELELTE_EVT:
@@ -962,11 +965,11 @@ int bt_mesh_gatts_service_register(struct bt_mesh_gatt_service *svc)
         if (svc->attrs[i].uuid->type == BLE_MESH_UUID_TYPE_16) {
             switch (BLE_MESH_UUID_16(svc->attrs[i].uuid)->val) {
             case BLE_MESH_UUID_GATT_PRIMARY_VAL: {
-                future_mesh = future_new();
+                gatts_future_mesh = future_new();
                 bta_uuid_to_bt_mesh_uuid(&bta_uuid, (struct bt_mesh_uuid *)svc->attrs[i].user_data);
                 BTA_GATTS_CreateService(bt_mesh_gatts_if,
                                         &bta_uuid, 0, svc->attr_count, true);
-                if (future_await(future_mesh) == FUTURE_FAIL) {
+                if (future_await(gatts_future_mesh) == FUTURE_FAIL) {
                     BT_ERR("Failed to add primary service");
                     return ESP_FAIL;
                 }
@@ -976,11 +979,11 @@ int bt_mesh_gatts_service_register(struct bt_mesh_gatt_service *svc)
                 break;
             }
             case BLE_MESH_UUID_GATT_SECONDARY_VAL: {
-                future_mesh = future_new();
+                gatts_future_mesh = future_new();
                 bta_uuid_to_bt_mesh_uuid(&bta_uuid, (struct bt_mesh_uuid *)svc->attrs[i].user_data);
                 BTA_GATTS_CreateService(bt_mesh_gatts_if,
                                         &bta_uuid, 0, svc->attr_count, false);
-                if (future_await(future_mesh) == FUTURE_FAIL) {
+                if (future_await(gatts_future_mesh) == FUTURE_FAIL) {
                     BT_ERR("Failed to add secondary service");
                     return ESP_FAIL;
                 }
@@ -993,11 +996,11 @@ int bt_mesh_gatts_service_register(struct bt_mesh_gatt_service *svc)
                 break;
             }
             case BLE_MESH_UUID_GATT_CHRC_VAL: {
-                future_mesh = future_new();
+                gatts_future_mesh = future_new();
                 struct bt_mesh_gatt_char *gatts_chrc = (struct bt_mesh_gatt_char *)svc->attrs[i].user_data;
                 bta_uuid_to_bt_mesh_uuid(&bta_uuid, gatts_chrc->uuid);
                 BTA_GATTS_AddCharacteristic(svc_handle, &bta_uuid, bt_mesh_perm_to_bta_perm(svc->attrs[i + 1].perm), gatts_chrc->properties, NULL, NULL);
-                if (future_await(future_mesh) == FUTURE_FAIL) {
+                if (future_await(gatts_future_mesh) == FUTURE_FAIL) {
                     BT_ERR("Failed to add characteristic");
                     return ESP_FAIL;
                 }
@@ -1019,10 +1022,10 @@ int bt_mesh_gatts_service_register(struct bt_mesh_gatt_service *svc)
             case BLE_MESH_UUID_ES_CONFIGURATION_VAL:
             case BLE_MESH_UUID_ES_MEASUREMENT_VAL:
             case BLE_MESH_UUID_ES_TRIGGER_SETTING_VAL: {
-                future_mesh = future_new();
+                gatts_future_mesh = future_new();
                 bta_uuid_to_bt_mesh_uuid(&bta_uuid, svc->attrs[i].uuid);
                 BTA_GATTS_AddCharDescriptor(svc_handle, bt_mesh_perm_to_bta_perm(svc->attrs[i].perm), &bta_uuid, NULL, NULL);
-                if (future_await(future_mesh) == FUTURE_FAIL) {
+                if (future_await(gatts_future_mesh) == FUTURE_FAIL) {
                     BT_ERR("Failed to add descriptor");
                     return ESP_FAIL;
                 }
@@ -1768,7 +1771,19 @@ void bt_mesh_gatt_init(void)
      CONFIG_BLE_MESH_GATT_PROXY_SERVER
     tBT_UUID gatts_app_uuid = {LEN_UUID_128, {0}};
     memset(&gatts_app_uuid.uu.uuid128, BLE_MESH_GATTS_APP_UUID_BYTE, LEN_UUID_128);
+
+    gatts_future_mesh = future_new();
+    if (!gatts_future_mesh) {
+        BT_ERR("Mesh gatts sync lock alloc failed");
+        return;
+    }
+
     BTA_GATTS_AppRegister(&gatts_app_uuid, bt_mesh_bta_gatts_cb);
+
+    if (future_await(gatts_future_mesh) == FUTURE_FAIL) {
+        BT_ERR("Mesh gatts app register failed");
+        return;
+    }
 #endif
 
 #if (CONFIG_BLE_MESH_PROVISIONER && CONFIG_BLE_MESH_PB_GATT) || \