diff --git a/packages/server/src/threads/automation.ts b/packages/server/src/threads/automation.ts
index ce7b1cd02b..48ddc89874 100644
--- a/packages/server/src/threads/automation.ts
+++ b/packages/server/src/threads/automation.ts
@@ -312,13 +312,15 @@ class Orchestrator {
         const job = cloneDeep(this.job)
         delete job.data.event.appId
         delete job.data.event.metadata
-        if (!job.data.event.timestamp) {
+
+        if (this.isCron() && !job.data.event.timestamp) {
           job.data.event.timestamp = Date.now()
         }
 
         const trigger: AutomationTriggerResult = {
           id: job.data.automation.definition.trigger.id,
           stepId: job.data.automation.definition.trigger.stepId,
+          inputs: null,
           outputs: job.data.event,
         }
         const result: AutomationResults = { trigger, steps: [trigger] }
diff --git a/packages/types/src/documents/app/automation/automation.ts b/packages/types/src/documents/app/automation/automation.ts
index 590e3e135f..db03efe5d4 100644
--- a/packages/types/src/documents/app/automation/automation.ts
+++ b/packages/types/src/documents/app/automation/automation.ts
@@ -211,7 +211,7 @@ export interface AutomationStepResult {
 export interface AutomationTriggerResult {
   id: string
   stepId: AutomationTriggerStepId
-  inputs?: Record<string, any>
+  inputs?: Record<string, any> | null
   outputs: Record<string, any>
 }