diff --git a/lib/providers/history_providers.dart b/lib/providers/history_providers.dart
index 7109ca4ba1..b0a8a5228d 100644
--- a/lib/providers/history_providers.dart
+++ b/lib/providers/history_providers.dart
@@ -82,26 +82,26 @@ class HistoryMetaStateNotifier
     }
   }
 
-  void addHistoryRequest(HistoryRequestModel model) async {
+  Future<void> addHistoryRequest(HistoryRequestModel model) async {
     final id = model.historyId;
     state = {...state ?? {}, id: model.metaData};
     final List<String> updatedHistoryKeys = state == null
         ? [id]
         : [...state!.keys, id];
-    hiveHandler.setHistoryIds(updatedHistoryKeys);
-    hiveHandler.setHistoryMeta(id, model.metaData.toJson());
+    await hiveHandler.setHistoryIds(updatedHistoryKeys);
+    await hiveHandler.setHistoryMeta(id, model.metaData.toJson());
     await hiveHandler.setHistoryRequest(id, model.toJson());
     await loadHistoryRequest(id);
   }
 
-  void editHistoryRequest(HistoryRequestModel model) async {
+  Future<void> editHistoryRequest(HistoryRequestModel model) async {
     final id = model.historyId;
     state = {...state ?? {}, id: model.metaData};
     final existingKeys = state?.keys.toList() ?? [];
     if (!existingKeys.contains(id)) {
-      hiveHandler.setHistoryIds([...existingKeys, id]);
+      await hiveHandler.setHistoryIds([...existingKeys, id]);
     }
-    hiveHandler.setHistoryMeta(id, model.metaData.toJson());
+    await hiveHandler.setHistoryMeta(id, model.metaData.toJson());
     await hiveHandler.setHistoryRequest(id, model.toJson());
     await loadHistoryRequest(id);
   }
diff --git a/lib/utils/envvar_utils.dart b/lib/utils/envvar_utils.dart
index f817dd967c..762f11f911 100644
--- a/lib/utils/envvar_utils.dart
+++ b/lib/utils/envvar_utils.dart
@@ -44,7 +44,8 @@ String? substituteVariables(
   if (envVarMap.keys.isEmpty) {
     return input;
   }
-  final regex = RegExp("{{(${envVarMap.keys.join('|')})}}");
+  final escapedKeys = envVarMap.keys.map(RegExp.escape).join('|');
+  final regex = RegExp("{{($escapedKeys)}}");
 
   String result = input.replaceAllMapped(regex, (match) {
     final key = match.group(1)?.trim() ?? '';