diff --git a/templates/question.html b/templates/question.html
index 8c1ac96..8af2f03 100644
--- a/templates/question.html
+++ b/templates/question.html
@@ -45,6 +45,7 @@ <h1>{{ .question.Title }}</h1>
         {{ if .question.Comments }} {{ template "comments.html"
         .question }} {{end}}
     </div>
+    {{ if .answers }}
     <hr class="post-divider" />
     <div class="answers-header">
         <h2>Answers</h2>
@@ -89,6 +90,7 @@ <h2>Answers</h2>
         {{end}}
     </div>
     {{ end }}
+    {{ end }}
 </body>
 
 </html>
\ No newline at end of file