diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
index ffb848bcb..5ae646570 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
@@ -29,7 +29,7 @@
                }}
             </div>
 
-            <!-- <div> //DOES NOT WORk
+            <div>
                <ul class="record_actions">
                   <li v-if="pinnedComment !== null">
                      <a class="btn btn-delete"
@@ -38,7 +38,7 @@
                      </a>
                   </li>
                </ul>
-            </div> -->
+            </div>
 
          </form>
       </div>
@@ -49,6 +49,7 @@
 <script>
 import CKEditor from '@ckeditor/ckeditor5-vue';
 import ClassicEditor from "ChillMainAssets/module/ckeditor5";
+import { mapState } from "vuex";
 
 export default {
    name: "Comment",
@@ -65,15 +66,15 @@ export default {
       }
    },
    computed: {
-      pinnedComment() {
-         return this.$store.state.accompanyingCourse.pinnedComment;
-      },
+      ...mapState({
+         pinnedComment: state => state.accompanyingCourse.pinnedComment,
+      }),
       content: {
          set(value) {
             this.formData.content = value;
          },
          get() {
-            return (this.pinnedComment)? this.pinnedComment.content : {};
+            return this.pinnedComment ? this.pinnedComment.content : '';
          }
       },
       errors() {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
index bfb6412ff..4e51b608f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -342,8 +342,7 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
             /**
              * Add/remove pinnedComment
              */
-            removePinnedComment({ commit }, payload) { //DOES NOT WORK
-
+            removePinnedComment({ commit }, payload) {
                const body = {type: "accompanying_period_comment", id: payload.id};
                const url = `/api/1.0/person/accompanying-course/${id}/comment.json`;