diff --git a/layouts/_default/index.html b/layouts/_default/index.html
index 1cab615..0368c94 100644
--- a/layouts/_default/index.html
+++ b/layouts/_default/index.html
@@ -20,9 +20,11 @@
           <a href="{{ .Permalink }}">{{ .Title | markdownify }}</a>
         </h1>
         <div class="post-meta">
+          {{- with .Date }}
           <span class="post-date">
-            {{ .Date.Format "2006-01-02" }}
+            {{ .Format "2006-01-02" }}
           </span>
+          {{- end }}
           {{ with .Params.Author }}
             <span class="post-author">:: {{ . }}</span>
           {{ end }}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 02f69b4..9fcba67 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -11,9 +11,11 @@
           <a href="{{ .Permalink }}">{{ .Title | markdownify }}</a>
         </h1>
         <div class="post-meta">
+        {{- with .Date }}
           <span class="post-date">
-            {{ .Date.Format "2006-01-02" }}
+            {{ .Format "2006-01-02" }}
           </span>
+        {{- end }}
           {{ with .Params.Author }}
             <span class="post-author">:: {{ . }}</span>
           {{ end }}