diff --git a/files/helpers/jinja2.py b/files/helpers/jinja2.py
index 5655be5748..5df085a4dc 100644
--- a/files/helpers/jinja2.py
+++ b/files/helpers/jinja2.py
@@ -25,7 +25,7 @@ def post_embed(id, v):
 @app.template_filter("favorite_emojis")
 def favorite_emojis(x):
 	str = ""
-	emojis = sorted(x["favorite_emojis"].items(), key=lambda x: x[1], reverse=True)
+	emojis = sorted(x.items(), key=lambda x: x[1], reverse=True)
 	for k, v in emojis:
 		str += f'<button class="btn m-1 px-0" onclick="getEmoji(\'{k}\', \'@form@\')" style="background: None!important; width:60px; overflow: hidden; border: none;" data-toggle="tooltip" title=":{k}:" delay:="0"><img loading="lazy" width=50 src="/assets/images/emojis/{k}.gif" alt="{k}-emoji"/></button>'
 	return str
diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html
index f5ed920ba4..d9076b4468 100644
--- a/files/templates/emoji_modal.html
+++ b/files/templates/emoji_modal.html
@@ -45,7 +45,9 @@
 					<div class="tab-content">
 						<div class="tab-pane fade show active" id="emoji-tab-favorite">
 							<div class="d-flex flex-wrap py-3 pl-2" id="EMOJIS_favorite">
-								{{session | favorite_emojis | safe}}								
+								{% if session.get("favorite_emojis") %}
+									{{session.get("favorite_emojis") | favorite_emojis | safe}}
+								{% endif %}								
 							</div>
 						</div>
 						<div class="tab-pane fade" id="emoji-tab-marsey">