diff --git a/files/routes/comments.py b/files/routes/comments.py
index e8cdbb123..44e743b8c 100644
--- a/files/routes/comments.py
+++ b/files/routes/comments.py
@@ -37,8 +37,8 @@ WORDLE_COLOR_MAPPINGS = {-1: "🟥", 0: "🟨", 1: "🟩"}
 @auth_desired
 def post_pid_comment_cid(cid, pid=None, anything=None, v=None, sub=None):
 
-	if not v and not request.path.startswith('/logged_out'): return redirect(f"/logged_out{request.full_path}#context")
-	if v and request.path.startswith('/logged_out'): return redirect(request.full_path.replace('/logged_out','') + '#context')
+	if not v and not request.path.startswith('/logged_out'): return redirect(f"/logged_out{request.full_path.rstrip('?')}#context")
+	if v and request.path.startswith('/logged_out'): return redirect(request.full_path.replace('/logged_out','').rstrip('?') + '#context')
 
 	try: cid = int(cid)
 	except: abort(404)
diff --git a/files/routes/front.py b/files/routes/front.py
index 47a81601b..8a0848e86 100644
--- a/files/routes/front.py
+++ b/files/routes/front.py
@@ -20,17 +20,12 @@ from files.helpers.awards import award_timers
 def front_all(v, sub=None, subdomain=None):
 
 	if not v and not request.path.startswith('/logged_out'):
-		r = request.full_path
-		if r == '/?': r = '/'
-		return redirect(f"/logged_out{r}")
+		return redirect(f"/logged_out{request.full_path.rstrip('?')}")
 
 	if v and v.is_banned and not v.unban_utc: return redirect('https://deuxrama.net')
 	
 	if v and request.path.startswith('/logged_out'):
-		if v.id == AEVANN_ID:
-			r = request.full_path.replace('/logged_out','')
-			print(r)
-			return redirect(r)
+		return redirect(request.full_path.replace('/logged_out','').rstrip('?'))
 
 	if sub: sub = g.db.query(Sub).filter_by(name=sub.strip().lower()).one_or_none()
 	
diff --git a/files/routes/posts.py b/files/routes/posts.py
index 38079c260..c1fbeccde 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -106,8 +106,8 @@ def submit_get(v, sub=None):
 @auth_desired
 def post_id(pid, anything=None, v=None, sub=None):
 
-	if not v and not request.path.startswith('/logged_out'): return redirect(f"/logged_out{request.full_path}")
-	if v and request.path.startswith('/logged_out'): return redirect(request.full_path.replace('/logged_out',''))
+	if not v and not request.path.startswith('/logged_out'): return redirect(f"/logged_out{request.full_path.rstrip('?')}")
+	if v and request.path.startswith('/logged_out'): return redirect(request.full_path.replace('/logged_out','').rstrip('?'))
 
 	try: pid = int(pid)
 	except Exception as e: pass
diff --git a/files/routes/static.py b/files/routes/static.py
index 244f1ef5e..d2c38876e 100644
--- a/files/routes/static.py
+++ b/files/routes/static.py
@@ -59,8 +59,8 @@ def marsey_list():
 @app.get('/logged_out/sidebar')
 @auth_desired
 def sidebar(v):
-	if not v and not request.path.startswith('/logged_out'): return redirect(f"/logged_out{request.full_path}")
-	if v and request.path.startswith('/logged_out'): return redirect(request.full_path.replace('/logged_out',''))
+	if not v and not request.path.startswith('/logged_out'): return redirect(f"/logged_out{request.full_path.rstrip('?')}")
+	if v and request.path.startswith('/logged_out'): return redirect(request.full_path.replace('/logged_out','').rstrip('?'))
 
 	return render_template('sidebar.html', v=v)
 
diff --git a/files/routes/users.py b/files/routes/users.py
index efbd3bd59..eec72cd9f 100644
--- a/files/routes/users.py
+++ b/files/routes/users.py
@@ -906,8 +906,8 @@ def visitors(v):
 @auth_desired
 def u_username(username, v=None):
 
-	if not v and not request.path.startswith('/logged_out'): return redirect(f"/logged_out{request.full_path}")
-	if v and request.path.startswith('/logged_out'): return redirect(request.full_path.replace('/logged_out',''))
+	if not v and not request.path.startswith('/logged_out'): return redirect(f"/logged_out{request.full_path.rstrip('?')}")
+	if v and request.path.startswith('/logged_out'): return redirect(request.full_path.replace('/logged_out','').rstrip('?'))
 
 	u = get_user(username, v=v, rendered=True)
 
@@ -1002,8 +1002,8 @@ def u_username(username, v=None):
 @auth_desired
 def u_username_comments(username, v=None):
 
-	if not v and not request.path.startswith('/logged_out'): return redirect(f"/logged_out{request.full_path}")
-	if v and request.path.startswith('/logged_out'): return redirect(request.full_path.replace('/logged_out',''))
+	if not v and not request.path.startswith('/logged_out'): return redirect(f"/logged_out{request.full_path.rstrip('?')}")
+	if v and request.path.startswith('/logged_out'): return redirect(request.full_path.replace('/logged_out','').rstrip('?'))
 
 	user = get_user(username, v=v, rendered=True)