diff --git a/client/src/components/email-overlay/email-overlay.container.jsx b/client/src/components/email-overlay/email-overlay.container.jsx
index f931728d9..f3e67f228 100644
--- a/client/src/components/email-overlay/email-overlay.container.jsx
+++ b/client/src/components/email-overlay/email-overlay.container.jsx
@@ -51,7 +51,9 @@ export function EmailOverlayContainer({
 
   const defaultEmailFrom = {
     from: {
-      name: `${currentUser.displayName} @ ${bodyshop.shopname}`,
+      name: currentUser.displayName
+        ? `${currentUser.displayName} @ ${bodyshop.shopname}`
+        : bodyshop.shopname,
       address: EmailSettings.fromAddress,
     },
     ReplyTo: {