diff --git a/app/apps.py b/app/apps.py
index f7b78044..8cab957b 100644
--- a/app/apps.py
+++ b/app/apps.py
@@ -19,8 +19,8 @@ def ready(self):
         # Implicitly connect a signal handlers decorated with @receiver.
         from . import signals
 
-        if settings.POSTHOG_PUBLIC_TOKEN:
-            posthog.api_key = settings.POSTHOG_PUBLIC_TOKEN
+        if settings.POSTHOG_PUBLIC_TOKEN is not None:
+            posthog.project_api_key = settings.POSTHOG_PUBLIC_TOKEN
             posthog.host = settings.POSTHOG_URL
-        if settings.DEBUG:
+        if settings.POSTHOG_PUBLIC_TOKEN is None or settings.DEBUG:
             posthog.disabled = True
diff --git a/app/settings/base.py b/app/settings/base.py
index 50df272f..21822474 100644
--- a/app/settings/base.py
+++ b/app/settings/base.py
@@ -310,5 +310,5 @@
 MJML_EXEC_CMD = "node_modules/.bin/mjml"
 
 # Posthog
-POSTHOG_PUBLIC_TOKEN = os.getenv("POSTHOG_PUBLIC_TOKEN")
+POSTHOG_PUBLIC_TOKEN = os.getenv("POSTHOG_PUBLIC_TOKEN", None)
 POSTHOG_URL = "https://app.posthog.com"