diff --git a/lib/sms-notices.js b/lib/sms-notices.js
index ac2b86fd..182cf62f 100644
--- a/lib/sms-notices.js
+++ b/lib/sms-notices.js
@@ -16,7 +16,7 @@ const getSMSNotices = () => {
 }
 
 const createSMSNotice = (event, messageName, message, enabled, allowToggle) => {
-  const sql = `INSERT INTO sms_notices (id, event, message_name, message${enabled ? `, enabled`: ``}${allowToggle ? `, allowToggle`: ``}) VALUES ($1, $2, $3, $4${enabled ? `, $5`: ``}${allowToggle ? `, $6`: ``})`
+  const sql = `INSERT INTO sms_notices (id, event, message_name, message, enabled, allow_toggle) VALUES ($1, $2, $3, $4, $5, $6)`
   return db.none(sql, [uuid.v4(), _.snakeCase(event), messageName, message, enabled, allowToggle])
 }
 
diff --git a/migrations/1643996603839-change-custom-sms-to-notices.js b/migrations/1643996603839-change-custom-sms-to-notices.js
index 3f19dbf3..777aa7cd 100644
--- a/migrations/1643996603839-change-custom-sms-to-notices.js
+++ b/migrations/1643996603839-change-custom-sms-to-notices.js
@@ -11,10 +11,15 @@ exports.up = function (next) {
     `ALTER TABLE sms_notices ADD COLUMN allow_toggle BOOLEAN NOT NULL DEFAULT true`
   ]
 
-  db.multi(sql, next)
-    .then(() => smsNotices.createSMSNotice('sms_code', 'SMS confirmation code', 'Your cryptomat code: #code', true, false))
-    .then(() => smsNotices.createSMSNotice('cash_out_dispense_ready', 'Cash is ready', 'Your cash is waiting! Go to the Cryptomat and press Redeem within 24 hours. [#timestamp]', true, false))
-    .then(() => smsNotices.createSMSNotice('sms_receipt', 'SMS receipt', '', true, true))
+  db.multi(
+    sql,
+    () => Promise.all([
+      smsNotices.createSMSNotice('sms_code', 'SMS confirmation code', 'Your cryptomat code: #code', true, false),
+      smsNotices.createSMSNotice('cash_out_dispense_ready', 'Cash is ready', 'Your cash is waiting! Go to the Cryptomat and press Redeem within 24 hours. [#timestamp]', true, false),
+      smsNotices.createSMSNotice('sms_receipt', 'SMS receipt', '', true, true)
+    ])
+      .then(() => next())
+  )
 }
 
 exports.down = function (next) {