diff --git a/demo/src/components/MessageComponent/MessageComponent.tsx b/demo/src/components/MessageComponent/MessageComponent.tsx
index 8d2038cf..55646cf1 100644
--- a/demo/src/components/MessageComponent/MessageComponent.tsx
+++ b/demo/src/components/MessageComponent/MessageComponent.tsx
@@ -79,17 +79,16 @@ export const MessageComponent: React.FC<MessageProps> = ({
               <span className="short">{shortDate(message.createdAt)}</span>
               <span className="long">{message.createdAt.toLocaleString()}</span>
             </span>
-            {message.isUpdated && (
-              <>
+            { (message.isUpdated && message.updatedAt) ? <>
                 {' '}
                 &middot; Edited{' '}
                 <span className="sent-at-time">
-                  <span className="short">{shortDate(message.updatedAt!)}</span>
-                  <span className="long">{message.updatedAt!.toLocaleString()}</span>
+                  <span className="short">{shortDate(message.updatedAt)}</span>
+                  <span className="long">{message.updatedAt.toLocaleString()}</span>
                 </span>
                 { message.updatedBy ? <span> by {message.updatedBy}</span> : '' }
-              </>
-            )}
+              </> : ''
+            }
           </div>
           <div
             className={clsx('px-4 py-2 rounded-lg inline-block', {