diff --git a/apps/www/components/Hero.tsx b/apps/www/components/Hero.tsx
index 53df050350e..32f699d2939 100644
--- a/apps/www/components/Hero.tsx
+++ b/apps/www/components/Hero.tsx
@@ -1,5 +1,4 @@
 import { Button, IconBookOpen } from 'ui'
-import Link from 'next/link'
 import { useRouter } from 'next/router'
 import SectionContainer from './Layouts/SectionContainer'
 import Telemetry, { GoogleAnalyticsEvent } from '~/lib/telemetry'
@@ -10,8 +9,8 @@ const Hero = () => {
   const router = useRouter()
   const googleAnalyticsProps = useGoogleAnalyticsProps()
 
-  const trackAndNavigate = (url: string, event: GoogleAnalyticsEvent) => {
-    Telemetry.sendEvent(event, googleAnalyticsProps)
+  const trackAndNavigate = async (url: string, event: GoogleAnalyticsEvent) => {
+    await Telemetry.sendEvent(event, googleAnalyticsProps)
     router.push(url)
   }
 
diff --git a/apps/www/lib/constants.ts b/apps/www/lib/constants.ts
index 5586bb59f81..445c0a6810a 100644
--- a/apps/www/lib/constants.ts
+++ b/apps/www/lib/constants.ts
@@ -1,7 +1,8 @@
 export const APP_NAME = 'Supabase'
 export const DESCRIPTION = 'The Open Source Alternative to Firebase.'
 export const IS_PROD = process.env.NEXT_PUBLIC_VERCEL_ENV === 'production'
-export const API_URL = IS_PROD ? process.env.NEXT_PUBLIC_API_URL : '/api'
+export const IS_PREVIEW = process.env.NEXT_PUBLIC_VERCEL_ENV === 'preview'
+export const API_URL = process.env.NEXT_PUBLIC_API_URL
 
 // Launch Weeek
 export const SAMPLE_TICKET_NUMBER = 1234
diff --git a/apps/www/lib/gaEvents.ts b/apps/www/lib/gaEvents.ts
index 53908751474..167aa356a0c 100644
--- a/apps/www/lib/gaEvents.ts
+++ b/apps/www/lib/gaEvents.ts
@@ -8,12 +8,12 @@ const GoogleAnalyticsEvents: GoogleAnalyticsEventType = {
   www_hp_hero_startProject: {
     action: 'www_hp_hero_startProject',
     category: 'link',
-    label: 'Clicks on “Start your project” button in the home page hero',
+    label: '',
   },
   www_hp_hero_documentation: {
     action: 'www_hp_hero_documentation',
     category: 'link',
-    label: 'Clicks on “Documentation” button in the home page hero',
+    label: '',
   },
 }
 
diff --git a/apps/www/lib/telemetry.ts b/apps/www/lib/telemetry.ts
index cdaa08cf1e8..0c6fb2ed9fe 100644
--- a/apps/www/lib/telemetry.ts
+++ b/apps/www/lib/telemetry.ts
@@ -1,5 +1,5 @@
 import { post } from '~/lib/fetchWrapper'
-import { API_URL, IS_PROD } from 'lib/constants'
+import { API_URL, IS_PROD, IS_PREVIEW } from 'lib/constants'
 
 export interface GoogleAnalyticsEvent {
   category: string
@@ -17,7 +17,7 @@ export interface GoogleAnalyticsProps {
 // but uses different ENV variables for www
 
 const sendEvent = (event: GoogleAnalyticsEvent, gaProps: GoogleAnalyticsProps) => {
-  if (!IS_PROD) return
+  if (!IS_PROD && !IS_PREVIEW) return
 
   const { category, action, label, value } = event