diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html
index 1db7e398ed..0063e7d226 100644
--- a/files/templates/emoji_modal.html
+++ b/files/templates/emoji_modal.html
@@ -45,11 +45,7 @@
 					<div id="no-emojis-found"></div>
 					<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">
-								{% if session.get("favorite_emojis") %}
-									{{session.get("favorite_emojis") | form | favorite_emojis | safe}}
-								{% endif %}								
-							</div>
+							<div class="d-flex flex-wrap py-3 pl-2" id="EMOJIS_favorite"></div>
 						</div>
 						<div class="tab-pane fade" id="emoji-tab-marsey">
 							<div class="d-flex flex-wrap py-3 pl-2" id="EMOJIS_marsey"></div>
diff --git a/files/templates/settings_profile.html b/files/templates/settings_profile.html
index e0d76e553b..77fe31c86a 100644
--- a/files/templates/settings_profile.html
+++ b/files/templates/settings_profile.html
@@ -592,7 +592,7 @@
 											&nbsp;
 											<pre style="padding-top:0.7rem;line-height:1;" class="btn btn-secondary format d-inline-block m-0 font-weight-bolder text-uppercase" onclick="commentForm('bio-text');getGif()" aria-hidden="true" data-toggle="modal" data-target="#gifModal" data-toggle="tooltip" data-placement="bottom" title="Add GIF">GIF</pre>
 											&nbsp;
-											<pre style="padding-top:0.7rem" class="btn btn-secondary format d-inline-block m-0 fas fa-smile-beam" onclick="loadEmojis('bio-text')" aria-hidden="true" data-toggle="modal" data-target="#emojiModal" data-toggle="tooltip" data-placement="bottom" title="Add Emoji"></pre>
+											<pre style="padding-top:0.7rem" class="btn btn-secondary format d-inline-block m-0 fas fa-smile-beam" onclick="loadEmojis('bio-text',{{session.get('favorite_emojis')}})" aria-hidden="true" data-toggle="modal" data-target="#emojiModal" data-toggle="tooltip" data-placement="bottom" title="Add Emoji"></pre>
 											&nbsp;
 										</div>