diff --git a/templates/status.tmpl b/templates/status.tmpl
index 9109f4e..7ca8192 100644
--- a/templates/status.tmpl
+++ b/templates/status.tmpl
@@ -87,7 +87,7 @@
 				{{end}}
 				{{end}}
 			</div>
-			{{if .Content}}
+			{{if (or .Content .SpoilerText)}}
 			<div class="status-content"> {{StatusContentFilter (html .SpoilerText) .Content .Emojis .Mentions}} </div>
 			{{end}}
 			{{if .MediaAttachments}}