diff --git a/api/controllers/console/app/workflow.py b/api/controllers/console/app/workflow.py
index d5b7cc2661..6fcc86c2e1 100644
--- a/api/controllers/console/app/workflow.py
+++ b/api/controllers/console/app/workflow.py
@@ -1009,8 +1009,9 @@ class DraftWorkflowTriggerNodeApi(Resource):
         api.model(
             "DraftWorkflowTriggerNodeRequest",
             {
-                "trigger_name": fields.String(required=True, description="Trigger name"),
+                "event_name": fields.String(required=True, description="Event name"),
                 "subscription_id": fields.String(required=True, description="Subscription ID"),
+                "provider_id": fields.String(required=True, description="Provider ID"),
             },
         )
     )
@@ -1029,16 +1030,19 @@ class DraftWorkflowTriggerNodeApi(Resource):
             raise Forbidden()
 
         parser = reqparse.RequestParser()
-        parser.add_argument("trigger_name", type=str, required=True, location="json", nullable=False)
+        parser.add_argument("event_name", type=str, required=True, location="json", nullable=False)
         parser.add_argument("subscription_id", type=str, required=True, location="json", nullable=False)
+        parser.add_argument("provider_id", type=str, required=True, location="json", nullable=False)
         args = parser.parse_args()
-        trigger_name = args["trigger_name"]
+        event_name = args["event_name"]
         subscription_id = args["subscription_id"]
+        provider_id = args["provider_id"]
 
         pool_key = PluginTriggerDebugEvent.build_pool_key(
             tenant_id=app_model.tenant_id,
+            provider_id=provider_id,
             subscription_id=subscription_id,
-            trigger_name=trigger_name,
+            event_name=event_name,
         )
         event: PluginTriggerDebugEvent | None = TriggerDebugService.poll(
             event_type=PluginTriggerDebugEvent,
diff --git a/api/services/trigger/trigger_debug_service.py b/api/services/trigger/trigger_debug_service.py
index 4a38991663..0f2b3b3f40 100644
--- a/api/services/trigger/trigger_debug_service.py
+++ b/api/services/trigger/trigger_debug_service.py
@@ -57,7 +57,7 @@ class PluginTriggerDebugEvent(BaseDebugEvent):
         provider_id = kwargs["provider_id"]
         subscription_id = kwargs["subscription_id"]
         event_name = kwargs["event_name"]
-        return f"trigger_debug_waiting_pool:{{{tenant_id}}}:{str(provider_id)}:{subscription_id}:{event_name}"
+        return f"trigger_debug_waiting_pool:{tenant_id}:{str(provider_id)}:{subscription_id}:{event_name}"
 
 
 class WebhookDebugEvent(BaseDebugEvent):
@@ -79,7 +79,7 @@ class WebhookDebugEvent(BaseDebugEvent):
         tenant_id = kwargs["tenant_id"]
         app_id = kwargs["app_id"]
         node_id = kwargs["node_id"]
-        return f"trigger_debug_waiting_pool:{{{tenant_id}}}:{app_id}:{node_id}"
+        return f"trigger_debug_waiting_pool:{tenant_id}:{app_id}:{node_id}"
 
 
 class TriggerDebugService:
@@ -111,7 +111,7 @@ class TriggerDebugService:
         "if #a==0 then return 0 end;"
         "redis.call('DEL',KEYS[1]);"
         "for i=1,#a do "
-        f"redis.call('SET','trigger_debug_inbox:{{'..ARGV[1]..'}}'..':'..a[i],ARGV[2],'EX',{TRIGGER_DEBUG_EVENT_TTL});"
+        f"redis.call('SET','trigger_debug_inbox:'..ARGV[1]..':'..a[i],ARGV[2],'EX',{TRIGGER_DEBUG_EVENT_TTL});"
         "end;"
         "return #a"
     )
@@ -176,7 +176,7 @@ class TriggerDebugService:
             Event object if available, None otherwise
         """
         address_id: str = hashlib.sha1(f"{user_id}|{app_id}|{node_id}".encode()).hexdigest()
-        address: str = f"trigger_debug_inbox:{{{tenant_id}}}:{address_id}"
+        address: str = f"trigger_debug_inbox:{tenant_id}:{address_id}"
 
         try:
             event_data = redis_client.eval(
diff --git a/web/app/components/workflow/utils/tool.ts b/web/app/components/workflow/utils/tool.ts
index 412e448d6f..1d5b068e1b 100644
--- a/web/app/components/workflow/utils/tool.ts
+++ b/web/app/components/workflow/utils/tool.ts
@@ -16,7 +16,7 @@ export const getToolCheckParams = (
   workflowTools: ToolWithProvider[],
   language: string,
 ) => {
-  const { provider_id, provider_type, trigger_name: tool_name } = toolData
+  const { provider_id, provider_type, tool_name: tool_name } = toolData
   const isBuiltIn = provider_type === CollectionType.builtIn
   const currentTools = provider_type === CollectionType.builtIn ? buildInTools : provider_type === CollectionType.custom ? customTools : workflowTools
   const currCollection = currentTools.find(item => canFindTool(item.id, provider_id))