diff --git a/components/Analytics.tsx b/components/Analytics.tsx
index 6736b664..1b2a4854 100644
--- a/components/Analytics.tsx
+++ b/components/Analytics.tsx
@@ -1,5 +1,21 @@
 import { sendEvent } from "$store/sdk/analytics.tsx";
 import type { AnalyticsEvent } from "apps/commerce/types.ts";
+import { scriptAsDataURI } from "apps/utils/dataURI.ts";
+
+const snippet = (id: string, event: AnalyticsEvent) => {
+  const element = document.getElementById(id);
+
+  if (!element) {
+    console.warn(
+      `Could not find element ${id}. Click event will not be send. This will cause loss in analytics`,
+    );
+  } else {
+    element.addEventListener(
+      "click",
+      () => window.DECO.events.dispatch(event),
+    );
+  }
+};
 
 /**
  * This function is usefull for sending events on click. Works with both Server and Islands components
@@ -7,17 +23,7 @@ import type { AnalyticsEvent } from "apps/commerce/types.ts";
 export const SendEventOnClick = <E extends AnalyticsEvent>({ event, id }: {
   event: E;
   id: string;
-}) => (
-  <script
-    type="module"
-    dangerouslySetInnerHTML={{
-      __html:
-        `document.getElementById("${id}").addEventListener("click", () => (${sendEvent})(${
-          JSON.stringify(event)
-        }));`,
-    }}
-  />
-);
+}) => <script defer src={scriptAsDataURI(snippet, id, event)} />;
 
 /**
  * This componente should be used when want to send event for rendered componentes.
@@ -25,11 +31,4 @@ export const SendEventOnClick = <E extends AnalyticsEvent>({ event, id }: {
  */
 export const SendEventOnLoad = <E extends AnalyticsEvent>(
   { event }: { event: E },
-) => (
-  <script
-    type="module"
-    dangerouslySetInnerHTML={{
-      __html: `(${sendEvent})(${JSON.stringify(event)});`,
-    }}
-  />
-);
+) => <script defer src={scriptAsDataURI(sendEvent, event)} />;
diff --git a/deno.json b/deno.json
index dcfd60a7..3f59fbf7 100644
--- a/deno.json
+++ b/deno.json
@@ -1,8 +1,8 @@
 {
   "imports": {
     "$store/": "./",
-    "deco/": "https://denopkg.com/deco-cx/deco@1.44.1/",
-    "apps/": "https://denopkg.com/deco-cx/apps@0.17.2/",
+    "deco/": "https://denopkg.com/deco-cx/deco@1.44.3/",
+    "apps/": "https://denopkg.com/deco-cx/apps@0.17.14/",
     "$fresh/": "https://denopkg.com/denoland/fresh@7ad4610e3a42aba42638cbc1041b96ee58a9b29e/",
     "preact": "https://esm.sh/preact@10.15.1",
     "preact/": "https://esm.sh/preact@10.15.1/",