diff --git a/lerna.json b/lerna.json
index 94ca18985e..74b10c07ea 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.22.17",
+  "version": "2.22.18",
   "npmClient": "yarn",
   "packages": [
     "packages/*",
diff --git a/packages/account-portal b/packages/account-portal
index 532c4db35c..a0ee9cad8c 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit 532c4db35cecd346b5c24f0b89ab7b397a122a36
+Subproject commit a0ee9cad8cefb8f9f40228705711be174f018fa9
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 253f5a0c14..f29ae3f7f2 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -72,7 +72,7 @@
     "fast-json-patch": "^3.1.1",
     "json-format-highlight": "^1.0.4",
     "lodash": "4.17.21",
-    "posthog-js": "^1.116.6",
+    "posthog-js": "^1.118.0",
     "remixicon": "2.5.0",
     "sanitize-html": "^2.7.0",
     "shortid": "2.2.15",
diff --git a/packages/builder/src/analytics/index.js b/packages/builder/src/analytics/index.js
index 3a80a05d7f..a0ddfe1d42 100644
--- a/packages/builder/src/analytics/index.js
+++ b/packages/builder/src/analytics/index.js
@@ -38,6 +38,10 @@ class AnalyticsHub {
     intercom.show(user)
   }
 
+  initPosthog() {
+    posthog.init()
+  }
+
   async logout() {
     posthog.logout()
     intercom.logout()
diff --git a/packages/builder/src/components/deploy/AppActions.svelte b/packages/builder/src/components/deploy/AppActions.svelte
index 1d7bb4f65e..30b95d639e 100644
--- a/packages/builder/src/components/deploy/AppActions.svelte
+++ b/packages/builder/src/components/deploy/AppActions.svelte
@@ -33,13 +33,10 @@
   import { TOUR_STEP_KEYS } from "components/portal/onboarding/tours.js"
   import { goto } from "@roxi/routify"
   import { onMount } from "svelte"
-  import PosthogClient from "../../analytics/PosthogClient"
 
   export let application
   export let loaded
 
-  const posthog = new PosthogClient(process.env.POSTHOG_TOKEN)
-
   let unpublishModal
   let updateAppModal
   let revertModal
@@ -156,7 +153,7 @@
   }
 
   onMount(() => {
-    posthog.init()
+    analytics.initPosthog()
   })
 </script>
 
diff --git a/packages/client/src/components/Screen.svelte b/packages/client/src/components/Screen.svelte
index 4b3acb2019..ac0af9f3b2 100644
--- a/packages/client/src/components/Screen.svelte
+++ b/packages/client/src/components/Screen.svelte
@@ -5,29 +5,29 @@
   import Provider from "./context/Provider.svelte"
   import { onMount, getContext } from "svelte"
   import { enrichButtonActions } from "../utils/buttonActions.js"
+  import { memo } from "@budibase/frontend-core"
 
   export let params = {}
 
   const context = getContext("context")
+  const onLoadActions = memo()
 
   // Get the screen definition for the current route
   $: screenDefinition = $screenStore.activeScreen?.props
-
-  $: runOnLoadActions(params)
+  $: onLoadActions.set($screenStore.activeScreen?.onLoad)
+  $: runOnLoadActions($onLoadActions, params)
 
   // Enrich and execute any on load actions.
   // We manually construct the full context here as this component is the
   // one that provides the url context, so it is not available in $context yet
-  const runOnLoadActions = params => {
-    const screenState = get(screenStore)
-
-    if (screenState.activeScreen?.onLoad && !get(builderStore).inBuilder) {
-      const actions = enrichButtonActions(screenState.activeScreen.onLoad, {
+  const runOnLoadActions = (actions, params) => {
+    if (actions?.length && !get(builderStore).inBuilder) {
+      const enrichedActions = enrichButtonActions(actions, {
         ...get(context),
         url: params,
       })
-      if (actions != null) {
-        actions()
+      if (enrichedActions != null) {
+        enrichedActions()
       }
     }
   }