diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
index 9f6bb753e..8d9484bb1 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
@@ -124,9 +124,10 @@ function loadDynamicPicker(element) {
         removeEntity({ entity }) {
           if (
             -1 ===
-            this.suggested.findIndex(
-              (e) => e.type === entity.type && e.id === entity.id,
-            )
+              this.suggested.findIndex(
+                (e) => e.type === entity.type && e.id === entity.id,
+              ) &&
+            "me" !== entity
           ) {
             this.suggested.push(entity);
           }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
index 639f3c59f..1defa245d 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="grey-card">
-    <ul :class="listClasses" v-if="picked.length && displayPicked">
+    <ul :class="listClasses" v-if="picked.length > 0 && displayPicked">
       <li
         v-for="p in picked"
         @click="removeEntity(p)"
@@ -103,7 +103,7 @@ const props = withDefaults(
     label?: string;
     isCurrentUserPicker?: boolean;
   }>(),
-  { isCurrentUserPicker: false },
+  { isCurrentUserPicker: false, displayPicked: true, removableIfSet: true },
 );
 
 const emits = defineEmits<{