diff --git a/files/assets/js/marked.js b/files/assets/js/marked.js
index d264d0275..ed923ceaf 100644
--- a/files/assets/js/marked.js
+++ b/files/assets/js/marked.js
@@ -12,15 +12,15 @@ function markdown(first, second) {
 			var remoji = emoji.replace(/:/g,'').toLowerCase();
 			if (remoji.startsWith("!#") || remoji.startsWith("#!"))
 			{
-				input = input.replace(emoji, "<img class='emoji-lg mirrored' src='/e/" + remoji.substring(2) + "'>")
+				input = input.replace(emoji, "<img class='emoji-lg mirrored' src='/e/" + remoji.substring(2) + ".webp'>")
 			} else if (remoji.startsWith("#"))
 			{
-				input = input.replace(emoji, "<img class='emoji-lg' src='/e/" + remoji.substring(1) + "'>")
+				input = input.replace(emoji, "<img class='emoji-lg' src='/e/" + remoji.substring(1) + ".webp'>")
 			} else if (remoji.startsWith("!"))
 			{
-				input = input.replace(emoji, "<img height=30 class='emoji mirrored' src='/e/" + remoji.substring(1) + "'>")
+				input = input.replace(emoji, "<img height=30 class='emoji mirrored' src='/e/" + remoji.substring(1) + ".webp'>")
 			} else {
-				input = input.replace(emoji, "<img height=30 class='emoji' src='/e/" + remoji + "'>")
+				input = input.replace(emoji, "<img height=30 class='emoji' src='/e/" + remoji + ".webp'>")
 			}
 		}
 	}
diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py
index 9e13b39fb..7c999a1ee 100644
--- a/files/helpers/sanitize.py
+++ b/files/helpers/sanitize.py
@@ -248,7 +248,7 @@ def sanitize(sanitized, noimages=False, alert=False, comment=False, edit=False):
 			elif remoji.endswith('pat') and path.isfile(f"files/assets/images/emojis/{remoji.replace('pat','')}.webp"):
 				pat(remoji.replace('pat',''))
 				new = re.sub(f'(?<!"):{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{emoji}:" title=":{emoji}:" class="{classes}" src="/e/{remoji}.webp">', new, flags=re.I|re.A)
-				requests.post(f'https://api.cloudflare.com/client/v4/zones/{CF_ZONE}/purge_cache', headers=CF_HEADERS, data={'files': [f"https://{request.host}/e/{emoji}", f"https://{request.host}/e/{emoji}.webp"]}, timeout=5)
+				requests.post(f'https://api.cloudflare.com/client/v4/zones/{CF_ZONE}/purge_cache', headers=CF_HEADERS, data={'files': [f"https://{request.host}/e/{emoji}.webp"]}, timeout=5)
 
 
 		sanitized = sanitized.replace(old, new)
@@ -285,7 +285,7 @@ def sanitize(sanitized, noimages=False, alert=False, comment=False, edit=False):
 		elif emoji.endswith('pat') and path.isfile(f"files/assets/images/emojis/{emoji.replace('pat','')}.webp"):
 			pat(emoji.replace('pat',''))
 			sanitized = re.sub(f'(?<!"):{i.group(1).lower()}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":!{old}:" title=":!{old}:" class="{classes}" src="/e/{emoji}.webp">', sanitized, flags=re.I|re.A)
-			requests.post(f'https://api.cloudflare.com/client/v4/zones/{CF_ZONE}/purge_cache', headers=CF_HEADERS, data={'files': [f"https://{request.host}/e/{emoji}", f"https://{request.host}/e/{emoji}.webp"]}, timeout=5)
+			requests.post(f'https://api.cloudflare.com/client/v4/zones/{CF_ZONE}/purge_cache', headers=CF_HEADERS, data={'files': [f"https://{request.host}/e/{emoji}.webp"]}, timeout=5)
 
 
 	for rd in ["://reddit.com", "://new.reddit.com", "://www.reddit.com", "://redd.it", "://libredd.it"]:
@@ -384,7 +384,7 @@ def filter_emojis_only(title, edit=False, graceful=False):
 		elif emoji.endswith('pat') and path.isfile(f"files/assets/images/emojis/{emoji.replace('pat','')}.webp"):
 			pat(emoji.replace('pat',''))
 			title = re.sub(f'(?<!"):{old}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{old}:" title=":{old}:" class="{classes}" src="/e/{emoji}.webp">', title, flags=re.I|re.A)
-			requests.post(f'https://api.cloudflare.com/client/v4/zones/{CF_ZONE}/purge_cache', headers=CF_HEADERS, data={'files': [f"https://{request.host}/e/{emoji}", f"https://{request.host}/e/{emoji}.webp"]}, timeout=5)
+			requests.post(f'https://api.cloudflare.com/client/v4/zones/{CF_ZONE}/purge_cache', headers=CF_HEADERS, data={'files': [f"https://{request.host}/e/{emoji}.webp"]}, timeout=5)
 
 
 	title = strikethrough_regex.sub(r'<del>\1</del>', title)
diff --git a/files/routes/static.py b/files/routes/static.py
index 85f60abda..922cc8d47 100644
--- a/files/routes/static.py
+++ b/files/routes/static.py
@@ -351,7 +351,7 @@ def archives(path):
 @app.get('/e/<emoji>')
 @limiter.exempt
 def emoji(emoji):
-	if not emoji.endswith('.webp'): emoji += '.webp'
+	if not emoji.endswith('.webp'): abort(404)
 	resp = make_response(send_from_directory('assets/images/emojis', emoji))
 	resp.headers.remove("Cache-Control")
 	resp.headers.add("Cache-Control", "public, max-age=3153600")
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 7eebbac05..6a3b78716 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -842,7 +842,7 @@
 	{% endif %}
 
 	{% if v %}
-		<script src="/static/assets/js/marked.js?v=249"></script>
+		<script src="/static/assets/js/marked.js?v=250"></script>
 		<script src="/static/assets/js/comments_v.js?v=263"></script>
 	{% endif %}
 
diff --git a/files/templates/submit.html b/files/templates/submit.html
index d2d286364..a89525212 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -266,7 +266,7 @@
 			checkForRequired()
 		</script>
 
-		<script src="/static/assets/js/marked.js?v=249"></script>
+		<script src="/static/assets/js/marked.js?v=250"></script>
 		<script src="/static/assets/js/formatting.js?v=240"></script>
 		<script src="/static/assets/js/submit.js?v=251"></script>
 		{% include "emoji_modal.html" %}
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index a42a84291..7243be130 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -767,7 +767,7 @@
 </nav>
 {% endif %}
 
-<script src="/static/assets/js/marked.js?v=249"></script>
+<script src="/static/assets/js/marked.js?v=250"></script>
 
 
 {% if v and v.id != u.id and '/comments' not in request.path %}