diff --git a/assets/templates/stats.html b/assets/templates/stats.html
index 1192ac1..c703d07 100644
--- a/assets/templates/stats.html
+++ b/assets/templates/stats.html
@@ -2,7 +2,9 @@
 <h2>Statistics</h2>
 <table>
     <tr><td>Published</td><td>{{.Published.Format "Jan 02, 2006 15:04:05 UTC"}}</td></tr>
+    {{if not .Edited.IsZero}}
     <tr><td>Edited</td><td>{{.Edited.Format "Jan 02, 2006 15:04:05 UTC"}}</td></tr>
+    {{end}}
     <tr><td>Views</td><td>{{.Views}}</td></tr>
 </table>
 {{end}}
diff --git a/server.go b/server.go
index 1cd5243..dca785e 100644
--- a/server.go
+++ b/server.go
@@ -55,6 +55,7 @@ func main() {
 
 	e.GET("/:id/stats", func(c echo.Context) error {
 		n, code := load(c, db)
+		n.prepare()
 		buf := bytes.NewBuffer([]byte{})
 		e.Renderer.Render(buf, "Stats", n, c)
 		n.Content = template.HTML(buf.String())
diff --git a/storage.go b/storage.go
index d9fc57a..c4fd231 100644
--- a/storage.go
+++ b/storage.go
@@ -149,16 +149,14 @@ func load(c echo.Context, db *sql.DB) (Note, int) {
 		code := http.StatusNotFound
 		return errPage(code), code
 	}
-	var edited time.Time
-	if editedVal != nil {
-		edited = editedVal.(time.Time)
-	}
 	n := &Note{
 		ID:        id,
 		Text:      text,
 		Views:     views,
 		Published: published,
-		Edited:    edited,
+	}
+	if editedVal != nil {
+		n.Edited = editedVal.(time.Time)
 	}
 	return *n, http.StatusOK
 }