1 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/design_management/components/design_notes/design_note.vue b/app/assets/javascripts/design_management/components/design_notes/design_note.vue
index b247f17fd97..022c5981d32 100644
--- a/app/assets/javascripts/design_management/components/design_notes/design_note.vue
+++ b/app/assets/javascripts/design_management/components/design_notes/design_note.vue
@@ -8,6 +8,7 @@ import {
   GlTooltipDirective,
 } from '@gitlab/ui';
 import { produce } from 'immer';
+import { isEmpty } from 'lodash';
 import * as Sentry from '~/sentry/sentry_browser_wrapper';
 import SafeHtml from '~/vue_shared/directives/safe_html';
 import { getIdFromGraphQLId, convertToGraphQLId } from '~/graphql_shared/utils';
@@ -101,7 +102,10 @@ export default {
       });
     },
     author() {
-      return this.note.author;
+      return this.note.author || {};
+    },
+    hasAuthor() {
+      return !isEmpty(this.author);
     },
     authorId() {
       return getIdFromGraphQLId(this.author.id);
@@ -274,6 +278,7 @@ export default {
     <div class="gl-display-flex gl-justify-content-space-between">
       <div>
         <gl-link
+          v-if="hasAuthor"
           v-once
           :href="author.webUrl"
           class="js-user-link link-inherit-color"
@@ -285,6 +290,7 @@ export default {
           <span v-if="author.status_tooltip_html" v-safe-html="author.status_tooltip_html"></span>
           <span class="note-headline-light">@{{ author.username }}</span>
         </gl-link>
+        <span v-else>{{ __('A deleted user') }}</span>
         <span class="note-headline-light note-headline-meta">
           <span class="system-note-message"> <slot></slot> </span>
           <gl-link