diff --git a/src/Orchard.Web/Core/Common/Shapes.cs b/src/Orchard.Web/Core/Common/Shapes.cs
index 22344ea63..075ea07eb 100644
--- a/src/Orchard.Web/Core/Common/Shapes.cs
+++ b/src/Orchard.Web/Core/Common/Shapes.cs
@@ -23,8 +23,12 @@ namespace Orchard.Core.Common {
         }
 
         [Shape]
-        public IHtmlString PublishedState(HtmlHelper Html, DateTime? dateTimeUtc) {
-            return Html.DateTime(dateTimeUtc, T("Draft"));
+        public IHtmlString PublishedState(HtmlHelper html, DateTime createdDateTimeUtc, DateTime? publisheddateTimeUtc) {
+            if (!publisheddateTimeUtc.HasValue) {
+                return T("Draft");
+            }
+
+            return html.DateTime(createdDateTimeUtc);
         }
 
         [Shape]
diff --git a/src/Orchard.Web/Core/Common/Views/Parts.Common.Metadata.Summary.cshtml b/src/Orchard.Web/Core/Common/Views/Parts.Common.Metadata.Summary.cshtml
index 5fa305f6b..eb13c1813 100644
--- a/src/Orchard.Web/Core/Common/Views/Parts.Common.Metadata.Summary.cshtml
+++ b/src/Orchard.Web/Core/Common/Views/Parts.Common.Metadata.Summary.cshtml
@@ -1 +1 @@
-<div class="published">@Display.PublishedState(dateTimeUtc: Model.ContentPart.PublishedUtc)</div>
\ No newline at end of file
+<div class="published">@Display.PublishedState(createdDateTimeUtc: Model.ContentPart.CreatedUtc, publisheddateTimeUtc: Model.ContentPart.PublishedUtc)</div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Common/Views/Parts.Common.Metadata.cshtml b/src/Orchard.Web/Core/Common/Views/Parts.Common.Metadata.cshtml
index 5fa305f6b..eb13c1813 100644
--- a/src/Orchard.Web/Core/Common/Views/Parts.Common.Metadata.cshtml
+++ b/src/Orchard.Web/Core/Common/Views/Parts.Common.Metadata.cshtml
@@ -1 +1 @@
-<div class="published">@Display.PublishedState(dateTimeUtc: Model.ContentPart.PublishedUtc)</div>
\ No newline at end of file
+<div class="published">@Display.PublishedState(createdDateTimeUtc: Model.ContentPart.CreatedUtc, publisheddateTimeUtc: Model.ContentPart.PublishedUtc)</div>
\ No newline at end of file