diff --git a/apps/course/templates/course/blocks/comments.html b/apps/course/templates/course/blocks/comments.html
index c762ebc5..b2b74983 100644
--- a/apps/course/templates/course/blocks/comments.html
+++ b/apps/course/templates/course/blocks/comments.html
@@ -1,5 +1,10 @@
 {% load mptt_tags %}
 
 {% recursetree object.comments.all %}
+{% if not node.deactivated_at %}
 {% include './comment.html' %}
-{{ children }} {% endrecursetree %}
\ No newline at end of file
+{% if not node.is_leaf_node %}
+{{ children }}
+{% endif %}
+{% endif %}
+{% endrecursetree %}