diff --git a/commitlint.config.js b/commitlint.config.js
index d5861f6b..6da72baa 100644
--- a/commitlint.config.js
+++ b/commitlint.config.js
@@ -44,6 +44,7 @@ module.exports = {
         "workflow",
         "types",
         "release",
+        "merge",
       ],
     ],
   },
diff --git a/src/store/modules/event.ts b/src/store/modules/event.ts
index 56b85387..bb6ec794 100644
--- a/src/store/modules/event.ts
+++ b/src/store/modules/event.ts
@@ -65,7 +65,7 @@ export const eventStore = defineStore({
       const res: AxiosResponse = await graphql.query("queryEndpoints").params({
         serviceId,
         duration: useAppStoreWithOut().durationTime,
-        keyword,
+        keyword: keyword || "",
       });
       if (res.data.errors) {
         return res.data;