diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7fb7d4680..6182b4d0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@ and this project adheres to
 
 <!-- write down unreleased development here -->
 
-
+* [person]: accompanying course work: remove creation date display the list of work + handle case when end date is null
 
 
 ## Test releases
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss
index e6bdb174b..cc56fcbda 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss
@@ -37,6 +37,9 @@ div.accompanying_course_work-list {
                             border-radius: 12px;
                             border: 2px solid $chill-green;
                         }
+                        &.no-label:before {
+                            display: none;
+                        }
                     }
                 }
             }
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig
index f0f0a051e..dd8beded5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig
@@ -20,14 +20,6 @@
 
           <div class="timeline">
             <ul>
-              <li class="completed">
-                <div class="date">
-                  <span>{{ w.createdAt|format_date('long') }}</span>
-                </div>
-                <div class="label">
-                  <span>{{ 'accompanying_course_work.create_date'|trans }}</span>
-                </div>
-              </li>
               <li class="completed">
                 <div class="date">
                   <span>{{ w.startDate|format_date('long') }}</span>
@@ -36,6 +28,11 @@
                   <span>{{ 'accompanying_course_work.start_date'|trans }}</span>
                 </div>
               </li>
+              {% if w.endDate == null %}
+              <li>
+                <div class="label no-label"></div>
+              </li>
+              {% else %}
               <li class="{%if date(w.endDate) < date('now') %}completed{% endif %}">
                 <div class="date">
                   <span>{{ w.endDate|format_date('long') }}</span>
@@ -44,6 +41,7 @@
                   <span>{{ 'accompanying_course_work.end_date'|trans }}</span>
                 </div>
               </li>
+              {% endif %}
             </ul>
           </div>