diff --git a/templates/post_reply.html b/templates/post_reply.html
index f50e392e..ddd0afd4 100644
--- a/templates/post_reply.html
+++ b/templates/post_reply.html
@@ -63,7 +63,7 @@
 					, {{ post.ratio }}
 				{% endif %}
 			{% endif %}
-			{% if config.show_filename %}
+			{% if config.show_filename and post.filename %}
 				, 
 				{% if post.filename|length > config.max_filename_display %}
 					<span title="{{ post.filename }}">{{ post.filename|truncate(config.max_filename_display) }}</span>
diff --git a/templates/post_thread.html b/templates/post_thread.html
index da93c5dd..cf93bed0 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -20,7 +20,7 @@
 				, {{ post.ratio }}
 			{% endif %}
 		{% endif %}
-		{% if config.show_filename %}
+		{% if config.show_filename and post.filename %}
 			, 
 			{% if post.filename|length > config.max_filename_display %}
 				<span title="{{ post.filename }}">{{ post.filename|truncate(config.max_filename_display) }}</span>