diff --git a/frontend/packages/data-portal/app/routes/api.event.ts b/frontend/packages/data-portal/app/routes/api.event.ts
index 1e57193df..b1d03c856 100644
--- a/frontend/packages/data-portal/app/routes/api.event.ts
+++ b/frontend/packages/data-portal/app/routes/api.event.ts
@@ -1,14 +1,28 @@
 import { ActionFunctionArgs } from '@remix-run/server-runtime'
 
-export async function action({ request }: ActionFunctionArgs) {
-  const response = await fetch('https://plausible.io/api/event', {
+import { ServerContext } from 'app/types/context'
+import { removeNullishValues } from 'app/utils/object'
+
+export async function action({ request, context }: ActionFunctionArgs) {
+  const { clientIp } = context as ServerContext
+
+  const payload = {
     body: request.body,
     method: request.method,
-    headers: {
+    headers: removeNullishValues({
       'Content-Type': 'application/json',
-    },
+      'user-agent': request.headers.get('user-agent'),
+      'X-Forwarded-For': clientIp,
+    }) as HeadersInit,
+  }
+
+  // eslint-disable-next-line no-console
+  console.log({
+    message: 'Sending plausible event',
+    payload,
   })
 
+  const response = await fetch('https://plausible.io/api/event', payload)
   const responseBody = await response.text()
   const { status, headers } = response
 
diff --git a/frontend/packages/data-portal/app/types/context.ts b/frontend/packages/data-portal/app/types/context.ts
new file mode 100644
index 000000000..72e2820e7
--- /dev/null
+++ b/frontend/packages/data-portal/app/types/context.ts
@@ -0,0 +1,5 @@
+import { AppLoadContext } from '@remix-run/server-runtime'
+
+export interface ServerContext extends AppLoadContext {
+  clientIp: string
+}
diff --git a/frontend/packages/data-portal/server.ts b/frontend/packages/data-portal/server.ts
index 78026bb77..027cc9fad 100644
--- a/frontend/packages/data-portal/server.ts
+++ b/frontend/packages/data-portal/server.ts
@@ -8,6 +8,8 @@ import fs from 'fs'
 import morgan from 'morgan'
 import sourceMapSupport from 'source-map-support'
 
+import { ServerContext } from 'app/types/context'
+
 // patch in Remix runtime globals
 installGlobals()
 sourceMapSupport.install()
@@ -25,11 +27,7 @@ async function reimportServer() {
 }
 
 // Create a request handler that watches for changes to the server build during development.
-async function createDevRequestHandler() {
-  // We'll make chokidar a dev dependency so it doesn't get bundled in production.
-  const chokidar =
-    process.env.NODE_ENV === 'development' ? await import('chokidar') : null
-
+async function getRequestHandler() {
   async function handleServerUpdate() {
     // 1. re-import the server build
     build = await reimportServer()
@@ -45,17 +43,24 @@ async function createDevRequestHandler() {
     broadcastDevReady(build)
   }
 
-  chokidar
-    ?.watch(WATCH_PATH, { ignoreInitial: true })
-    .on('add', handleServerUpdate)
-    .on('change', handleServerUpdate)
+  if (process.env.NODE_ENV === 'development') {
+    // We'll make chokidar a dev dependency so it doesn't get bundled in production.
+    const chokidar =
+      process.env.NODE_ENV === 'development' ? await import('chokidar') : null
+
+    chokidar
+      ?.watch(WATCH_PATH, { ignoreInitial: true })
+      .on('add', handleServerUpdate)
+      .on('change', handleServerUpdate)
+  }
 
   // wrap request handler to make sure its recreated with the latest build for every request
   return async (req: Request, res: Response, next: NextFunction) => {
     try {
       await createRequestHandler({
         build,
-        mode: 'development',
+        mode: process.env.NODE_ENV,
+        getLoadContext: () => ({ clientIp: req.ip }) as ServerContext,
       })(req, res, next)
     } catch (error) {
       next(error)
@@ -85,15 +90,7 @@ async function main() {
   app.use(morgan('tiny'))
 
   // Check if the server is running in development mode and use the devBuild to reflect realtime changes in the codebase.
-  app.all(
-    '*',
-    process.env.NODE_ENV === 'development'
-      ? await createDevRequestHandler()
-      : createRequestHandler({
-          build,
-          mode: process.env.NODE_ENV,
-        }),
-  )
+  app.all('*', await getRequestHandler())
 
   const port = process.env.PORT || 8080
   app.listen(port, () => {