diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
index 90a1462bf..21713e37d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
@@ -72,47 +72,45 @@
                         </div>
                     </div>
                 </div>
+
+                {% if accompanying_period.requestorPerson is not null or accompanying_period.requestorThirdParty is not null %}
                 <div class="item-row">
                     <div class="wraplist">
                         <div class="wl-row">
                             <div class="wl-col title"><h3>{{ 'Requestor'|trans }}</h3></div>
                             <div class="wl-col list">
-                                {% if accompanying_period.requestorPerson is not null or accompanying_period.requestorThirdParty is not null %}
-                                    {% if accompanying_period.requestorPerson is not null %}
-                                        <p class="wl-item">
-                                            {{ accompanying_period.requestorPerson.firstname ~ ' ' ~ accompanying_period.requestorPerson.lastname }}
-                                        </p>
-                                    {% endif %}
-                                    {% if accompanying_period.requestorThirdParty is not null %}
-                                        <p class="wl-item">
-                                            {{ accompanying_period.requestorThirdParty.name }}
-                                        </p>
-                                    {% endif %}
-                                {% else %}
-                                    <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
+                                {% if accompanying_period.requestorPerson is not null %}
+                                    <p class="wl-item">
+                                        {{ accompanying_period.requestorPerson.firstname ~ ' ' ~ accompanying_period.requestorPerson.lastname }}
+                                    </p>
+                                {% endif %}
+                                {% if accompanying_period.requestorThirdParty is not null %}
+                                    <p class="wl-item">
+                                        {{ accompanying_period.requestorThirdParty.name }}
+                                    </p>
                                 {% endif %}
                             </div>
                         </div>
                     </div>
                 </div>
-                <div class="item-row">
-                    <div class="wraplist">
-                        <div class="wl-row">
-                            <div class="wl-col title"><h3>{{ 'Social issues'|trans }}</h3></div>
-                            <div class="wl-col list">
-                                {% if accompanying_period.socialIssues.count > 0 %}
+                {% endif %}
+
+                {% if accompanying_period.socialIssues.count > 0 %}
+                    <div class="item-row">
+                        <div class="wraplist">
+                            <div class="wl-row">
+                                <div class="wl-col title"><h3>{{ 'Social issues'|trans }}</h3></div>
+                                <div class="wl-col list">
                                     {% for si in accompanying_period.socialIssues %}
                                         <p class="wl-item">
                                             {{ si.title|localize_translatable_string }}
                                         </p>
                                     {% endfor %}
-                                {% else %}
-                                    <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
-                                {% endif %}
+                                </div>
                             </div>
                         </div>
                     </div>
-                </div>
+                {% endif %}
 
                 <div class="item-row separator">
                     <ul class="record_actions">