diff --git a/files/routes/static.py b/files/routes/static.py
index 1bd8e82a9..9ff770c72 100644
--- a/files/routes/static.py
+++ b/files/routes/static.py
@@ -42,6 +42,7 @@ def reddit_post(subreddit, v, path):
 
 
 @app.get("/marseys")
+@app.get("/marseys/all")
 @limiter.limit(DEFAULT_RATELIMIT)
 @limiter.limit(DEFAULT_RATELIMIT, key_func=get_ID)
 @auth_required
@@ -64,7 +65,10 @@ def marseys(v:User):
 	try: page = max(int(request.values.get("page", 1)), 1)
 	except: page = 1
 
-	marseys = marseys.offset(PAGE_SIZE*(page-1)).limit(PAGE_SIZE).all()
+	if request.path != "/marseys/all":
+		marseys = marseys.offset(PAGE_SIZE*(page-1)).limit(PAGE_SIZE)
+
+	marseys = marseys.all()
 
 	original = os.listdir("/asset_submissions/emojis/original")
 	for marsey, user in marseys:
diff --git a/files/templates/marseys.html b/files/templates/marseys.html
index 8496f13a6..71f262218 100644
--- a/files/templates/marseys.html
+++ b/files/templates/marseys.html
@@ -42,5 +42,7 @@
 {% endblock %}
 
 {% block pagenav %}
-{% include "pagination.html" %}
+{% if request.path != "/marseys/all" %}
+	{% include "pagination.html" %}
+{% endif %}
 {% endblock %}