diff --git a/src/apps.js b/src/apps.js
index 7457d38e2..5f5b147d5 100644
--- a/src/apps.js
+++ b/src/apps.js
@@ -545,7 +545,7 @@ function getDuplicateErrorDetails(errorMessage, locations, portBindings) {
     assert(Array.isArray(locations));
     assert.strictEqual(typeof portBindings, 'object');
 
-    const match = errorMessage.match(/ER_DUP_ENTRY: Duplicate entry '(.*)' for key '(.*)'/);
+    const match = errorMessage.match(/Duplicate entry '(.*)' for key '(.*)'/);
     if (!match) {
         debug('Unexpected SQL error message.', errorMessage);
         return new BoxError(BoxError.DATABASE_ERROR, errorMessage);
diff --git a/src/mail.js b/src/mail.js
index cce5536fd..4c2769ef9 100644
--- a/src/mail.js
+++ b/src/mail.js
@@ -1065,7 +1065,7 @@ async function setAliases(name, domain, aliases, auditSource) {
 
     const [error] = await safe(database.transaction(queries));
     if (error && error.code === 'ER_DUP_ENTRY' && error.message.indexOf('mailboxes_name_domain_unique_index') !== -1) {
-        const aliasMatch = error.message.match(new RegExp(`^ER_DUP_ENTRY: Duplicate entry '(.*)-${domain}' for key 'mailboxes_name_domain_unique_index'$`));
+        const aliasMatch = error.message.match(new RegExp(`Duplicate entry '(.*)-${domain}' for key 'mailboxes_name_domain_unique_index'`));
         if (!aliasMatch) throw new BoxError(BoxError.ALREADY_EXISTS, error.message);
 
         throw new BoxError(BoxError.ALREADY_EXISTS, `Mailbox, mailinglist or alias for ${aliasMatch[1]} already exists`);