diff --git a/templates/tracker/comment_edit.html b/templates/tracker/comment_edit.html
index e11aae4..4ea72fb 100644
--- a/templates/tracker/comment_edit.html
+++ b/templates/tracker/comment_edit.html
@@ -24,7 +24,7 @@
       <div class="tab-content">
         <div class="tab-pane active" id="editor" style="max-height: 220px;">
           <div class="form-group">
-            <textarea style="width: 100%; height: 220px;" id="markdown-content" name="comment" required>{{ form.comment.value }}</textarea>
+            <textarea style="width: 100%; height: 220px;" id="markdown-content" name="comment" required>{{ form.comment.value|default_if_none:"" }}</textarea>
           </div>
         </div>
         <div class="tab-pane well" id="preview" style="min-height: 200px; magin: 0;">
diff --git a/templates/tracker/issue_edit.html b/templates/tracker/issue_edit.html
index b3fda8f..238cb62 100644
--- a/templates/tracker/issue_edit.html
+++ b/templates/tracker/issue_edit.html
@@ -26,7 +26,7 @@
       <div class="tab-content">
         <div class="tab-pane active" id="editor" style="max-height: 220px;">
           <div class="form-group">
-            <textarea style="width: 100%; height: 220px;" id="markdown-content" name="description">{{ form.description.value }}</textarea>
+            <textarea style="width: 100%; height: 220px;" id="markdown-content" name="description">{{ form.description.value|default_if_none:"" }}</textarea>
           </div>
         </div>
         <div class="tab-pane well" id="preview" style="min-height: 200px; magin: 0;">