diff --git a/app/views/diaries/show.md.erb b/app/views/diaries/show.md.erb
index 3b92ba382..1251f1c90 100644
--- a/app/views/diaries/show.md.erb
+++ b/app/views/diaries/show.md.erb
@@ -1,3 +1,3 @@
 <%= render "nodes/front_matter", :content => @diary %>
 
-<%= raw @diary.wiki_body %>
+<%= raw @diary.wiki_body.encode(universal_newline: true) %>
diff --git a/app/views/news/show.md.erb b/app/views/news/show.md.erb
index 83efc63fa..b5374d9f1 100644
--- a/app/views/news/show.md.erb
+++ b/app/views/news/show.md.erb
@@ -1,6 +1,6 @@
 <%= render "nodes/front_matter", :content => @news %>
 
-<%= raw @news.wiki_body %>
+<%= raw @news.wiki_body.encode(universal_newline: true) %>
 
 ----
 
@@ -10,4 +10,4 @@
 
 ----
 
-<%= raw @news.wiki_second_part %>
+<%= raw @news.wiki_second_part.encode(universal_newline: true) %>
diff --git a/app/views/polls/show.md.erb b/app/views/polls/show.md.erb
index 0ddf4ad22..92feba338 100644
--- a/app/views/polls/show.md.erb
+++ b/app/views/polls/show.md.erb
@@ -1,6 +1,6 @@
 <%= render "nodes/front_matter", :content => @poll %>
 
-<%= raw @poll.wiki_explanations %>
+<%= raw @poll.wiki_explanations.encode(universal_newline: true) %>
 
 <%- @poll.answers.each do |answer| -%>
 * <%= raw answer.answer %>
diff --git a/app/views/posts/show.md.erb b/app/views/posts/show.md.erb
index 71d5e7566..651e18a5b 100644
--- a/app/views/posts/show.md.erb
+++ b/app/views/posts/show.md.erb
@@ -1,3 +1,3 @@
 <%= render "nodes/front_matter", :content => @post %>
 
-<%= raw @post.wiki_body %>
+<%= raw @post.wiki_body.encode(universal_newline: true) %>
diff --git a/app/views/trackers/show.md.erb b/app/views/trackers/show.md.erb
index 99806e4c7..b8cbe1cec 100644
--- a/app/views/trackers/show.md.erb
+++ b/app/views/trackers/show.md.erb
@@ -1,3 +1,3 @@
 <%= render "nodes/front_matter", :content => @tracker %>
 
-<%= raw @tracker.wiki_body %>
+<%= raw @tracker.wiki_body.encode(universal_newline: true) %>
diff --git a/app/views/wiki_pages/show.md.erb b/app/views/wiki_pages/show.md.erb
index 072f6a9cf..3b831b071 100644
--- a/app/views/wiki_pages/show.md.erb
+++ b/app/views/wiki_pages/show.md.erb
@@ -1,3 +1,3 @@
 <%= render "nodes/front_matter", :content => @wiki_page %>
 
-<%= raw @wiki_page.versions.first.body %>
+<%= raw @wiki_page.versions.first.body.encode(universal_newline: true) %>