diff --git a/app/javascript/dashboard/helper/messageHelper.js b/app/javascript/dashboard/helper/messageHelper.js
index 1ae9a9aff..eb2042066 100644
--- a/app/javascript/dashboard/helper/messageHelper.js
+++ b/app/javascript/dashboard/helper/messageHelper.js
@@ -8,7 +8,7 @@ export const replaceVariablesInMessage = ({ message, variables }) => {
 };
 
 export const capitalizeName = name => {
-  return name.replace(/\b(\w)/g, s => s.toUpperCase());
+  return (name || '').replace(/\b(\w)/g, s => s.toUpperCase());
 };
 
 const skipCodeBlocks = str => str.replace(/```(?:.|\n)+?```/g, '');
diff --git a/app/javascript/dashboard/helper/specs/messageHelper.spec.js b/app/javascript/dashboard/helper/specs/messageHelper.spec.js
index c661c483b..5aa29f616 100644
--- a/app/javascript/dashboard/helper/specs/messageHelper.spec.js
+++ b/app/javascript/dashboard/helper/specs/messageHelper.spec.js
@@ -143,6 +143,9 @@ describe('#capitalizeName', () => {
     const string = 'john peter';
     expect(capitalizeName(string)).toBe('John Peter');
   });
+  it('returns empty string if the name is null', () => {
+    expect(capitalizeName(null)).toBe('');
+  });
   it('capitalize first name if full name is passed', () => {
     const string = 'john Doe';
     expect(capitalizeName(string)).toBe('John Doe');