diff --git a/files/routes/static.py b/files/routes/static.py
index 9fc48666c..3820ea705 100644
--- a/files/routes/static.py
+++ b/files/routes/static.py
@@ -49,15 +49,13 @@ def marseys_redirect():
 
 @cache.cached(make_cache_key=lambda kind, nsfw:f"emoji_list_{kind}_{nsfw}")
 def get_emoji_list(kind, nsfw):
-	li = g.db.query(Emoji, User).join(User, Emoji.author_id == User.id).filter(Emoji.submitter_id == None, Emoji.kind == kind)
-	if not nsfw:
-		li = li.filter(Emoji.nsfw == False)
-	li = li.order_by(Emoji.count.desc())
+	emojis = g.db.query(Emoji).filter(Emoji.submitter_id == None, Emoji.kind == kind)
+
+	if not nsfw:
+		emojis = emojis.filter(Emoji.nsfw == False)
+
+	emojis = emojis.order_by(Emoji.count.desc())
 
-	emojis = []
-	for emoji, author in li:
-		emoji.author = author.username if FEATURES['EMOJI_SUBMISSIONS'] else None
-		emojis.append(emoji)
 	return emojis
 
 @app.get("/emojis/<kind>")