diff --git a/content/_index.md b/content/_index.md
index 7d6d3f98a..0a7dfc1a3 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -24,3 +24,4 @@ If you prefer browsing the contents of this site through a list instead of a gra
 - 🚧 [Troubleshooting and FAQ](notes/troubleshooting.md)
 - 🐛 [Submit an Issue](https://github.com/jackyzha0/quartz/issues)
 - 👀 [Discord Community](https://discord.gg/cRFFHYye7t)
+
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 7c2ab10f5..b4dd6dee1 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -10,7 +10,7 @@
     <article>
       {{if .Title}}<h1>{{ .Title }}</h1>{{end}}
       <p class="meta">
-          Last updated {{if ne .Date .Lastmod}}{{ .Lastmod.Format "January 2, 2006" }}{{else}}Unknown{{end}}. 
+          Last updated {{ partial "date-fmt.html" .}} 
           {{ partial "github.html" . }}
       </p>
       <ul class="tags">
diff --git a/layouts/partials/date-fmt.html b/layouts/partials/date-fmt.html
new file mode 100644
index 000000000..6104226e2
--- /dev/null
+++ b/layouts/partials/date-fmt.html
@@ -0,0 +1,7 @@
+{{if .Date}}
+{{.Date.Format "Jan 2, 2006"}}
+{{else if .Lastmod}}
+{{.Lastmod.Format "Jan 2, 2006"}}
+{{else}}
+Unknown
+{{end}}
diff --git a/layouts/partials/page-list.html b/layouts/partials/page-list.html
index f630f1a78..385a0e77c 100644
--- a/layouts/partials/page-list.html
+++ b/layouts/partials/page-list.html
@@ -3,7 +3,7 @@
     <li class="section-li">
         <div class="section">
             <p class="meta">
-                {{if ne .Date .Lastmod}}{{ .Lastmod.Format "January 2, 2006" }}{{else}}Unknown{{end}}
+                {{partial "date-fmt.html" .}}
             </p>
             <div class="desc">
                 <h3><a href="{{ .Permalink }}">{{- .Title -}}</a></h3>