diff --git a/files/__main__.py b/files/__main__.py
index 9a2c601b2b..cfd06350a7 100644
--- a/files/__main__.py
+++ b/files/__main__.py
@@ -109,6 +109,10 @@ def before_request():
 	request.full_path = request.full_path.rstrip('?').rstrip('/')
 	if not request.full_path: request.full_path = '/'
 
+	if not session.get("session_id"):
+		session.permanent = True
+		session["session_id"] = secrets.token_hex(49)
+
 @app.after_request
 def after_request(response):
 	response.headers.add("Strict-Transport-Security", "max-age=31536000")
diff --git a/files/helpers/wrappers.py b/files/helpers/wrappers.py
index 1022d7d630..8be3c61cdc 100644
--- a/files/helpers/wrappers.py
+++ b/files/helpers/wrappers.py
@@ -63,11 +63,6 @@ def get_logged_in_user():
 		abort(403)
 
 
-	if not session.get("session_id"):
-		session.permanent = True
-		session["session_id"] = secrets.token_hex(49)
-
-
 	g.v = v
 
 	if v: