diff --git a/src/apps.js b/src/apps.js
index 0f44ca820..0ffd5bcbc 100644
--- a/src/apps.js
+++ b/src/apps.js
@@ -1655,7 +1655,7 @@ async function setLocation(app, data, auditSource) {
     }
 
     // rename the auto-created mailbox to match the new location
-    if (app.manifest.addons?.sendmail && app.mailboxName.endsWith('.app')) {
+    if (app.manifest.addons?.sendmail && app.mailboxName?.endsWith('.app')) {
         values.mailboxName = mailboxNameForLocation(values.location, app.manifest);
         values.mailboxDomain = values.domain;
     }