diff --git a/app/views/admin/communication/website/pages/jekyll.html.erb b/app/views/admin/communication/website/pages/jekyll.html.erb
index 4dc6603a8f6fc5688c8cbede80d2c8af5f4321fb..a3207c1db23d0f7dfd5bc2219454ae96e261bdde 100644
--- a/app/views/admin/communication/website/pages/jekyll.html.erb
+++ b/app/views/admin/communication/website/pages/jekyll.html.erb
@@ -2,7 +2,7 @@
 title: "<%= @page.title %>"
 permalink: "<%= @page.path %>"
 parent: "<%= @page.parent_id %>"
-description: "<%= @page.description %>"
+description: "<%= prepare_for_github @page.description %>"
 text: "<%= prepare_for_github @page.text %>"
 ---
 <%= @page.content_without_frontmatter.html_safe %>
diff --git a/app/views/admin/communication/website/posts/jekyll.html.erb b/app/views/admin/communication/website/posts/jekyll.html.erb
index cc5dd8f8e6df28300c1b3cc82507b831396df430..6739f18c7a37273bd516d71242875d5188f091ce 100644
--- a/app/views/admin/communication/website/posts/jekyll.html.erb
+++ b/app/views/admin/communication/website/posts/jekyll.html.erb
@@ -2,7 +2,7 @@
 title: "<%= @post.title %>"
 date: <%= @post.published_at %> UTC
 slug: "<%= @post.slug %>"
-description: "<%= @post.description %>"
+description: "<%= prepare_for_github @post.description %>"
 text: "<%= prepare_for_github @post.text %>"
 ---
 <%= @post.content_without_frontmatter.html_safe %>
diff --git a/app/views/admin/communication/website/posts/show.html.erb b/app/views/admin/communication/website/posts/show.html.erb
index 52679295d3388a4099900fe3303ebc8d6be242af..1fd65d4beb3b14368fd0bdf5bdda7f97e909004d 100644
--- a/app/views/admin/communication/website/posts/show.html.erb
+++ b/app/views/admin/communication/website/posts/show.html.erb
@@ -31,7 +31,7 @@
           </tr>
           <tr>
             <td><%= Communication::Website::Page.human_attribute_name('published_at') %></td>
-            <td><%= l @post.published_at, format: :long %></td>
+            <td><%= l @post.published_at, format: :long if @post.published_at %></td>
           </tr>
           <tr>
             <td><%= Communication::Website::Page.human_attribute_name('published') %></td>