diff --git a/lib/towerops_web/endpoint.ex b/lib/towerops_web/endpoint.ex
index 3ac163cc..36fbd15f 100644
--- a/lib/towerops_web/endpoint.ex
+++ b/lib/towerops_web/endpoint.ex
@@ -77,6 +77,7 @@ defmodule ToweropsWeb.Endpoint do
   plug Plug.MethodOverride
   plug Plug.Head
   plug Plug.Session, @session_options
+  plug ToweropsWeb.Plugs.CaptureTimezone
   plug ToweropsWeb.Router
 
   # Disable logging for health check endpoint to reduce log noise from K8s probes
diff --git a/lib/towerops_web/plugs/capture_timezone.ex b/lib/towerops_web/plugs/capture_timezone.ex
index adae2ead..d57ed3a6 100644
--- a/lib/towerops_web/plugs/capture_timezone.ex
+++ b/lib/towerops_web/plugs/capture_timezone.ex
@@ -14,6 +14,8 @@ defmodule ToweropsWeb.Plugs.CaptureTimezone do
 
   @doc false
   def call(conn, _opts) do
+    conn = fetch_session(conn)
+
     timezone =
       case get_req_header(conn, "cf-timezone") do
         [tz] when is_binary(tz) and byte_size(tz) > 0 -> tz