diff --git a/src/open_cups/session_state.py b/src/open_cups/session_state.py
index 626c159..5194acb 100644
--- a/src/open_cups/session_state.py
+++ b/src/open_cups/session_state.py
@@ -1,5 +1,3 @@
-import uuid
-
 import streamlit as st
 
 
@@ -12,9 +10,7 @@ class SessionState:
 
     def __init__(self) -> None:
         if "session_id" not in st.session_state:
-            existing = st.query_params.get("session_id")
-            st.session_state.session_id = existing or str(uuid.uuid4())
-        st.query_params["session_id"] = st.session_state.session_id
+            st.session_state.session_id = st.context.cookies["ajs_anonymous_id"]
 
     @property
     def session_id(self) -> str: