diff --git a/addons/hr_attendance/static/src/js/my_attendances.js b/addons/hr_attendance/static/src/js/my_attendances.js
index 4a19b2b9b28..228f35c1813 100644
--- a/addons/hr_attendance/static/src/js/my_attendances.js
+++ b/addons/hr_attendance/static/src/js/my_attendances.js
@@ -25,11 +25,7 @@ var MyAttendances = AbstractAction.extend({
                 args: [[['user_id', '=', this.getSession().uid]], ['attendance_state', 'name']],
             })
             .then(function (res) {
-                if (_.isEmpty(res) ) {
-                    self.$('.o_hr_attendance_employee').append(_t("Error : Could not find employee linked to user"));
-                    return;
-                }
-                self.employee = res[0];
+                self.employee = res.length && res[0];
                 self.$el.html(QWeb.render("HrAttendanceMyMainMenu", {widget: self}));
             });
 
diff --git a/addons/hr_attendance/static/src/xml/attendance.xml b/addons/hr_attendance/static/src/xml/attendance.xml
index e9de1799dce..264d13a4780 100644
--- a/addons/hr_attendance/static/src/xml/attendance.xml
+++ b/addons/hr_attendance/static/src/xml/attendance.xml
@@ -47,7 +47,7 @@
                     <h3 class="mt0 mb0 text-muted">Click to <b t-if="checked_in">check out</b><b t-if="!checked_in">check in</b></h3>
                 </t>
                 <t t-else="">
-                    Error : Could not find employee linked to user.
+                    Warning : Your user should be linked to an employee to use attendance. Please contact your administrator.
                 </t>
             </div>
         </div>