diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
index 413080a78..307c462e2 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
@@ -1,15 +1,22 @@
-{% macro recordAction(period, person = null) %}
+{% if person is defined %}
+    {% set contextEntity = { 'type': 'person', 'entity': person } %}{% endif %}
+{% if household is defined %}
+    {% set contextEntity = { 'type': 'household', 'entity': household } %}{% endif %}
+
+{% macro recordAction(period, contextEntity) %}
     {# TODO if enable_accompanying_course_with_multiple_persons is true ... #}
     <li>
         <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': period.id }) }}"
            class="btn btn-show" title="{{ 'See accompanying period'|trans }}">{# {{ 'See this period'|trans }} #}</a>
     </li>
-    {% if period.step == 'DRAFT' %}
+    {% if period.step == 'DRAFT' and contextEntity.type == 'person' %}
+        {% set person = contextEntity.entity %}
         <li>
             <a href="{{ path('chill_person_accompanying_course_delete', { 'accompanying_period_id': period.id, 'person_id' : person.id }) }}"
                class="btn btn-delete" title="{{ 'Delete accompanying period'|trans }}">{# {{ 'Delete this period'|trans }} #}</a>
         </li>
     {% endif %}
+
     {# DISABLED if new accompanying course, this is not necessary
     {% if person is defined %}
         <li>
@@ -45,7 +52,7 @@
         {% for period in accompanying_periods %}
 
             {% include 'ChillPersonBundle:AccompanyingPeriod:_list_item.html.twig' with {
-                'recordAction': _self.recordAction(period, person)
+                'recordAction': _self.recordAction(period, contextEntity)
             } %}
 
         {% endfor %}