diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
index aeaaeac37..db81ec320 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
@@ -107,7 +107,7 @@ This view should receive those arguments:
             </figure>
         </div>
 
-        {% if person.genderComment is not empty %}
+        {% if person.genderComment.comment is not empty %}
             <div class="col-12">
                 <figure class="person-details">
                     <h2 class="chill-beige">{{ 'Gender comment'|trans }}&nbsp;:</h2>
@@ -162,14 +162,16 @@ This view should receive those arguments:
                         {% endif %}
                     </dd>
 
-                    {% if person.maritalStatusComment is not empty %}
-                        <dt>{{ 'Comment on the marital status'|trans }}&nbsp;:</dt>
-                        <dd>
+                    <dt>{{ 'Comment on the marital status'|trans }}&nbsp;:</dt>
+                    <dd>
+                        {% if person.maritalStatusComment.comment is not empty %}
                             <blockquote class="chill-user-quote">
                                 {{ person.maritalStatusComment.comment|chill_markdown_to_html }}
                             </blockquote>
-                        </dd>
-                    {% endif %}
+                        {% else %}
+                            <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
+                        {% endif %}
+                    </dd>
                 </dl>
                 {%- endif -%}
             </figure>