diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/PersonItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/PersonItem.vue
index d494898d3..3aa4f7def 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/PersonItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/PersonItem.vue
@@ -13,7 +13,7 @@
    <td>
       <ul class="record_actions">
          <button-location
-            v-if="!participation.endDate">
+            v-if="hasCurrentHouseholdAddress">
          </button-location>
          <li>
             <on-the-fly
@@ -60,5 +60,14 @@ export default {
    },
    props: ['participation'],
    emits: ['remove', 'close'],
+   computed: {
+      hasCurrentHouseholdAddress() {
+         if ( !this.participation.endDate
+            && this.participation.person.current_household_address !== null ) {
+            return true;
+         }
+         return false;
+      }
+   }
 }
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
index c0879afb8..cea7815f4 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
@@ -21,7 +21,7 @@
    <td>
       <ul class="record_actions">
          <button-location
-            v-if="resource.resource.type === 'person'">
+            v-if="hasCurrentHouseholdAddress">
          </button-location>
          <li>
             <on-the-fly
@@ -60,6 +60,15 @@ export default {
       ButtonLocation
    },
    props: ['resource'],
-   emits: ['remove']
+   emits: ['remove'],
+   computed: {
+      hasCurrentHouseholdAddress() {
+         if ( !this.resource.resource.type === 'person'
+            && this.resource.resource.current_household_address !== null ) {
+            return true;
+         }
+         return false;
+      }
+   }
 }
 </script>