diff --git a/drama/helpers/session.py b/drama/helpers/session.py
index 2706ab720..34878e79f 100644
--- a/drama/helpers/session.py
+++ b/drama/helpers/session.py
@@ -7,7 +7,7 @@ def session_over18():
 
 	now = int(time.time())
 
-	return session.get('over_18', {}).get(1) >= now
+	return session.get('over_18', 0) >= now
 
 
 def make_logged_out_formkey(t):
diff --git a/drama/routes/errors.py b/drama/routes/errors.py
index 69817cd99..702d5fedb 100644
--- a/drama/routes/errors.py
+++ b/drama/routes/errors.py
@@ -159,12 +159,7 @@ def error_503(e, v):
 @validate_formkey
 def allow_nsfw_logged_in(v):
 
-	cutoff = int(time.time()) + 3600
-
-	if not session.get("over_18", None):
-		session["over_18"] = {}
-
-	session["over_18"][1] = cutoff
+	if not session.get("over_18"): session["over_18"] = int(time.time()) + 3600
 
 	return redirect(request.form.get("redir"))
 
@@ -183,11 +178,7 @@ def allow_nsfw_logged_out(v):
 									   ):
 		abort(403)
 
-	if not session.get("over_18", None):
-		session["over_18"] = {}
-
-	cutoff = int(time.time()) + 3600
-	session["over_18"][1] = cutoff
+	if not session.get("over_18"): session["over_18"] = int(time.time()) + 3600
 
 	return redirect(request.form.get("redir"))