diff --git a/submissions/templates/submissions/_single_public_report_without_comments.html b/submissions/templates/submissions/_single_public_report_without_comments.html
index bad492424de08ddb7c528cca2a7d70e0eba1e438..f39932745a139ece5d79a744868724e0bf1945f8 100644
--- a/submissions/templates/submissions/_single_public_report_without_comments.html
+++ b/submissions/templates/submissions/_single_public_report_without_comments.html
@@ -28,9 +28,10 @@
                 <div class="row">
                     <div class="col-12">
                         <h3>Remarks for editors</h3>
-                        <div class="pl-md-4">{{ report.remarks_for_editors }}</div>
+                        <div class="pl-md-4">{{ report.remarks_for_editors|default:'-' }}</div>
                     </div>
                 </div>
+
                 <div class="row">
                     <div class="col-12">
                         <h3>Recommendation</h3>
diff --git a/submissions/templates/submissions/_single_report_content.html b/submissions/templates/submissions/_single_report_content.html
index 82e06f943f39743d148e56b154382759fe1b2fa8..3e1874d8a8f4d81b1b1550dfb0bca28d0b0ce4be 100644
--- a/submissions/templates/submissions/_single_report_content.html
+++ b/submissions/templates/submissions/_single_report_content.html
@@ -1,27 +1,36 @@
-<div class="row">
-    <div class="col-12">
-        <h3 class="highlight tight">Strengths</h3>
-        <div class="pl-md-4">{{ report.strengths|linebreaks }}</div>
+{% if report.strengths %}
+    <div class="row">
+        <div class="col-12">
+            <h3 class="highlight tight">Strengths</h3>
+            <div class="pl-md-4">{{ report.strengths|linebreaks }}</div>
+        </div>
     </div>
-</div>
-<div class="row">
-    <div class="col-12">
-        <h3 class="highlight tight">Weaknesses</h3>
-        <div class="pl-md-4">{{ report.weaknesses|linebreaks }}</div>
+{% endif %}
+
+{% if report.weaknesses %}
+    <div class="row">
+        <div class="col-12">
+            <h3 class="highlight tight">Weaknesses</h3>
+            <div class="pl-md-4">{{ report.weaknesses|linebreaks }}</div>
+        </div>
     </div>
-</div>
+{% endif %}
+
 <div class="row">
     <div class="col-12">
         <h3 class="highlight tight">Report</h3>
         <div class="pl-md-4">{{ report.report|linebreaks }}</div>
     </div>
 </div>
-<div class="row">
-    <div class="col-12">
-        <h3 class="highlight tight">Requested changes</h3>
-        <div class="pl-md-4">
-            <p>{{ report.requested_changes|linebreaks }}</p>
-            {% include 'submissions/_single_report_ratings.html' with report=report %}
-      </div>
-  </div>
-</div>
+
+{% if report.requested_changes %}
+    <div class="row">
+        <div class="col-12">
+            <h3 class="highlight tight">Requested changes</h3>
+            <div class="pl-md-4">
+                <p>{{ report.requested_changes|linebreaksbr }}</p>
+                {% include 'submissions/_single_report_ratings.html' with report=report %}
+            </div>
+        </div>
+    </div>
+{% endif %}