diff --git a/app/assets/javascripts/notes/components/issue_discussion.vue b/app/assets/javascripts/notes/components/issue_discussion.vue
index 96c63e587af..1a8d3b98309 100644
--- a/app/assets/javascripts/notes/components/issue_discussion.vue
+++ b/app/assets/javascripts/notes/components/issue_discussion.vue
@@ -170,7 +170,7 @@
               class="discussion"
               />
             <issue-note-edited-text
-              v-if="lastUpdatedBy"
+              v-if="lastUpdatedAt"
               :edited-at="lastUpdatedAt"
               :edited-by="lastUpdatedBy"
               action-text="Last updated"
diff --git a/app/assets/javascripts/notes/components/issue_note_body.vue b/app/assets/javascripts/notes/components/issue_note_body.vue
index 7d4333e4d27..8e35920e659 100644
--- a/app/assets/javascripts/notes/components/issue_note_body.vue
+++ b/app/assets/javascripts/notes/components/issue_note_body.vue
@@ -99,7 +99,7 @@
       :data-update-url="note.path"
       class="hidden js-task-list-field"></textarea>
     <issue-note-edited-text
-      v-if="note.last_edited_by"
+      v-if="note.last_edited_at"
       :edited-at="note.last_edited_at"
       :edited-by="note.last_edited_by"
       action-text="Edited"
diff --git a/app/assets/javascripts/notes/components/issue_note_edited_text.vue b/app/assets/javascripts/notes/components/issue_note_edited_text.vue
index 315fa61cfcc..49e09f0ecc5 100644
--- a/app/assets/javascripts/notes/components/issue_note_edited_text.vue
+++ b/app/assets/javascripts/notes/components/issue_note_edited_text.vue
@@ -14,7 +14,7 @@
       },
       editedBy: {
         type: Object,
-        required: true,
+        required: false,
       },
       className: {
         type: String,
@@ -35,11 +35,13 @@
       :time="editedAt"
       tooltip-placement="bottom"
       />
-    by
-    <a
-      :href="editedBy.path"
-      class="js-vue-author author_link">
-      {{editedBy.name}}
-    </a>
+    <template v-if="editedBy">
+      by
+      <a
+        :href="editedBy.path"
+        class="js-vue-author author_link">
+        {{editedBy.name}}
+      </a>
+    </template>
   </div>
 </template>