diff --git a/ts/components/conversation/ProfileChangeNotification.stories.tsx b/ts/components/conversation/ProfileChangeNotification.stories.tsx
index 2ed29958fd..a3cc65f062 100644
--- a/ts/components/conversation/ProfileChangeNotification.stories.tsx
+++ b/ts/components/conversation/ProfileChangeNotification.stories.tsx
@@ -19,14 +19,14 @@ storiesOf('Components/Conversation/ProfileChangeNotification', module)
         changedContact={{
           id: 'some-guid',
           type: 'direct',
-          title: 'John',
-          name: 'John',
+          title: 'Mr. Fire 🔥',
+          name: 'Mr. Fire 🔥',
           lastUpdated: Date.now(),
         }}
         change={{
           type: 'name',
-          oldName: 'John Old',
-          newName: 'John New',
+          oldName: 'Mr. Fire 🔥 Old',
+          newName: 'Mr. Fire 🔥 New',
         }}
       />
     );
@@ -38,13 +38,13 @@ storiesOf('Components/Conversation/ProfileChangeNotification', module)
         changedContact={{
           id: 'some-guid',
           type: 'direct',
-          title: 'John',
+          title: 'Mr. Fire 🔥',
           lastUpdated: Date.now(),
         }}
         change={{
           type: 'name',
-          oldName: 'John Old',
-          newName: 'John New',
+          oldName: 'Mr. Fire 🔥 Old',
+          newName: 'Mr. Fire 🔥 New',
         }}
       />
     );
diff --git a/ts/components/conversation/ProfileChangeNotification.tsx b/ts/components/conversation/ProfileChangeNotification.tsx
index 805a834ec0..d0f15d0201 100644
--- a/ts/components/conversation/ProfileChangeNotification.tsx
+++ b/ts/components/conversation/ProfileChangeNotification.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 
 import { LocalizerType } from '../../types/Util';
 import { ConversationType } from '../../state/ducks/conversations';
+import { Emojify } from './Emojify';
 import {
   getStringForProfileChange,
   ProfileNameChangeType,
@@ -20,7 +21,7 @@ export function ProfileChangeNotification(props: PropsType): JSX.Element {
   return (
     <div className="module-profile-change-notification">
       <div className="module-profile-change-notification--icon" />
-      {message}
+      <Emojify text={message} />
     </div>
   );
 }