diff --git a/web/app/components/workflow-app/hooks/use-workflow-run.ts b/web/app/components/workflow-app/hooks/use-workflow-run.ts
index 7e8a5ac502..b3602f60bf 100644
--- a/web/app/components/workflow-app/hooks/use-workflow-run.ts
+++ b/web/app/components/workflow-app/hooks/use-workflow-run.ts
@@ -241,7 +241,7 @@ export const useWorkflowRun = () => {
       setListeningTriggerNodeId,
     } = workflowStore.getState()
 
-    if (runMode === 'webhook') {
+    if (runMode === 'webhook' || runMode === 'plugin') {
       setIsListening(true)
       setShowVariableInspectPanel(true)
       setWorkflowRunningData({
@@ -255,18 +255,6 @@ export const useWorkflowRun = () => {
         resultText: '',
       })
     }
-    else if (runMode === 'plugin') {
-      setIsListening(true)
-      setShowVariableInspectPanel(true)
-      setWorkflowRunningData({
-        result: {
-          status: WorkflowRunningStatus.Running,
-          inputs_truncated: false,
-          process_data_truncated: false,
-          outputs_truncated: false,
-        },
-      })
-    }
     else {
       setIsListening(false)
       setListeningTriggerType(null)
diff --git a/web/app/components/workflow/header/run-mode.tsx b/web/app/components/workflow/header/run-mode.tsx
index c34549e355..e5fcd8f52a 100644
--- a/web/app/components/workflow/header/run-mode.tsx
+++ b/web/app/components/workflow/header/run-mode.tsx
@@ -68,7 +68,8 @@ const RunMode = ({
         handleWorkflowTriggerWebhookRunInWorkflow({ nodeId: option.nodeId })
     }
     else if (option.type === 'plugin') {
-      handleWorkflowTriggerPluginRunInWorkflow(option.nodeId)
+      if (option.nodeId)
+        handleWorkflowTriggerPluginRunInWorkflow(option.nodeId)
     }
     else {
       // Placeholder for trigger-specific execution logic for schedule, webhook, plugin types