diff --git a/packages/builder/src/builderStore/store/automation/index.js b/packages/builder/src/builderStore/store/automation/index.js
index 50a1f476ef..7bd0ccca22 100644
--- a/packages/builder/src/builderStore/store/automation/index.js
+++ b/packages/builder/src/builderStore/store/automation/index.js
@@ -87,13 +87,15 @@ const automationActions = store => ({
     const response = await api.post(`/api/automations/${_id}/test`, testData)
     const json = await response.json()
     store.update(state => {
-      state.selectedAutomation.automation.testResults = json
+      state.selectedAutomation.testResults = json
       return state
     })
   },
   select: automation => {
     store.update(state => {
+      let testResults = state.selectedAutomation?.testResults
       state.selectedAutomation = new Automation(cloneDeep(automation))
+      state.selectedAutomation.testResults = testResults
       state.selectedBlock = null
       return state
     })
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
index 5ce55437be..ba80e195ab 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
@@ -25,11 +25,10 @@
   let resultsModal
   let setupToggled
   let blockComplete
-  $: testResult =
-    $automationStore.selectedAutomation.automation.testResults?.steps.filter(
-      step => step.stepId === block.stepId
-    )
 
+  $: testResult = $automationStore.selectedAutomation.testResults?.steps.filter(
+    step => step.stepId === block.stepId
+  )
   $: isTrigger = block.type === "TRIGGER"
 
   $: selected = $automationStore.selectedBlock?.id === block.id
diff --git a/packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte b/packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte
index 79de4bfbe6..aa3ab027a8 100644
--- a/packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte
@@ -9,6 +9,7 @@
   onMount(() => {
     automationStore.actions.fetch()
   })
+
   function selectAutomation(automation) {
     automationStore.actions.select(automation)
     $goto(`./${automation._id}`)