diff --git a/app/assets/javascripts/vue_shared/components/markdown/field.vue b/app/assets/javascripts/vue_shared/components/markdown/field.vue
index f84652d397c..4e1d623647e 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/field.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/field.vue
@@ -64,12 +64,11 @@
           .then(resp => resp.json())
           .then((data) => {
             this.markdownPreviewLoading = false;
-            this.markdownPreview = data.body;
-            this.referencedCommands = data.references.commands;
-            this.referencedUsers = data.references.users;
+            this.markdownPreview = data.body || 'Nothing to preview.';
 
-            if (!this.markdownPreview) {
-              this.markdownPreview = 'Nothing to preview.';
+            if (data.references) {
+              this.referencedCommands = data.references.commands;
+              this.referencedUsers = data.references.users;
             }
 
             this.$nextTick(() => {
diff --git a/spec/javascripts/vue_shared/components/markdown/field_spec.js b/spec/javascripts/vue_shared/components/markdown/field_spec.js
index 291e19c9f3c..84d9a3782a6 100644
--- a/spec/javascripts/vue_shared/components/markdown/field_spec.js
+++ b/spec/javascripts/vue_shared/components/markdown/field_spec.js
@@ -92,6 +92,7 @@ describe('Markdown field component', () => {
 
       it('renders GFM with jQuery', (done) => {
         spyOn($.fn, 'renderGFM');
+
         previewLink.click();
 
         setTimeout(() => {
@@ -100,7 +101,7 @@ describe('Markdown field component', () => {
           ).toHaveBeenCalled();
 
           done();
-        });
+        }, 0);
       });
     });