diff --git a/templates/Binarity/Resources/views/modules/article/visitor/default.blade.php b/templates/Binarity/Resources/views/modules/article/visitor/default.blade.php
index b773dec2..a6482b64 100644
--- a/templates/Binarity/Resources/views/modules/article/visitor/default.blade.php
+++ b/templates/Binarity/Resources/views/modules/article/visitor/default.blade.php
@@ -7,9 +7,9 @@
     <div class="row article-list-item">
         <aside class="column text-right large-1">
             <div class="date">
-                <span class="date day big">@customDate('j', $page->published_from)</span>
+                <span class="date day big">@customDate('j', $page->published_from ?: $page->created_at)</span>
                 <br>
-                <span class="date uppercase month">@monthName($page->published_from)</span>
+                <span class="date uppercase month">@monthName($page->published_from ?: $page->created_at)</span>
             </div>
             <div class="m-t-25 author">
                 <img class="gravatar" src="@gravatar($page->author->email, 50)" alt="">
diff --git a/templates/Binarity/Resources/views/modules/articlelist/visitor/default.blade.php b/templates/Binarity/Resources/views/modules/articlelist/visitor/default.blade.php
index 2ac5a75a..fe0d8e41 100644
--- a/templates/Binarity/Resources/views/modules/articlelist/visitor/default.blade.php
+++ b/templates/Binarity/Resources/views/modules/articlelist/visitor/default.blade.php
@@ -14,9 +14,9 @@
             <div class="row">
                 <aside class="column text-right large-3">
                     <div class="date">
-                        <span class="date day big">@customDate('j', $article->published_from)</span>
+                        <span class="date day big">@customDate('j', $article->published_from ?: $article->created_at)</span>
                         <br>
-                        <span class="date uppercase month">@monthName($article->published_from)</span>
+                        <span class="date uppercase month">@monthName($article->published_from ?: $article->created_at)</span>
                     </div>
                     <div class="m-t-25 author">
                         {{--<small>{{str_limit($article->author->name, 15)}}</small>--}}