diff --git a/packages/builder/src/components/start/ChooseIconModal.svelte b/packages/builder/src/components/start/ChooseIconModal.svelte
index 1f26cb93ec..1ffaa35e34 100644
--- a/packages/builder/src/components/start/ChooseIconModal.svelte
+++ b/packages/builder/src/components/start/ChooseIconModal.svelte
@@ -49,7 +49,6 @@
       return
     }
     try {
-      console.log(app.instance._id)
       await apps.update(app.instance._id, {
         icon: { name, color },
       })
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/automations/index.svelte b/packages/builder/src/pages/builder/app/[application]/settings/automations/index.svelte
index 603f83a7dd..fde392e31d 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/automations/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/automations/index.svelte
@@ -37,7 +37,7 @@
   let timeRange = null
   let loaded = false
 
-  $: app = $apps.find(app => app.devId === $store.appId)
+  $: app = $apps.find(app => app.devId === $store.appId?.includes(app.appId))
   $: licensePlan = $auth.user?.license?.plan
   $: page = $pageInfo.page
   $: fetchLogs(automationId, status, page, timeRange)
diff --git a/packages/server/src/events/AutomationEmitter.ts b/packages/server/src/events/AutomationEmitter.ts
index 3297fc7263..32fd130929 100644
--- a/packages/server/src/events/AutomationEmitter.ts
+++ b/packages/server/src/events/AutomationEmitter.ts
@@ -4,6 +4,8 @@ import env from "../environment"
 import { Table, Row, DocumentType, App } from "@budibase/types"
 import { context } from "@budibase/backend-core"
 
+const MAX_AUTOMATIONS_ALLOWED = 5
+
 class AutomationEmitter {
   chainCount: number
   metadata: { automationChainCount: number }
@@ -21,9 +23,9 @@ class AutomationEmitter {
     let chainAutomations = appMetadata?.automations?.chainAutomations
 
     if (chainAutomations === true) {
-      return 5
+      return MAX_AUTOMATIONS_ALLOWED
     } else if (chainAutomations === undefined && env.SELF_HOSTED) {
-      return 5
+      return MAX_AUTOMATIONS_ALLOWED
     } else {
       return 0
     }