diff --git a/pagure/templates/settings.html b/pagure/templates/settings.html
index 2a90324..c76401c 100644
--- a/pagure/templates/settings.html
+++ b/pagure/templates/settings.html
@@ -684,7 +684,9 @@
                 </div>
                 <div class="col-sm-6 p-r-0">
                   <input type="text" name="milestone_dates"
-                    value="{{ repo.milestones[milestone] }}" class="form-control"/>
+                    value="{{ repo.milestones[milestone]
+                        if repo.milestones[milestone] is not none
+                    }}" class="form-control"/>
                 </div>
               </div>
           {% endfor %}