diff --git a/cypress/e2e/27-two-factor-authentication.cy.ts b/cypress/e2e/27-two-factor-authentication.cy.ts
index 47dcc02fcc..e2aa0d0f96 100644
--- a/cypress/e2e/27-two-factor-authentication.cy.ts
+++ b/cypress/e2e/27-two-factor-authentication.cy.ts
@@ -3,6 +3,7 @@ import { INSTANCE_OWNER, BACKEND_BASE_URL } from '../constants';
 import { SigninPage } from '../pages';
 import { PersonalSettingsPage } from '../pages/settings-personal';
 import { MfaLoginPage } from '../pages/mfa-login';
+import generateOTPToken from 'cypress-otp';
 
 const MFA_SECRET = 'KVKFKRCPNZQUYMLXOVYDSQKJKZDTSRLD';
 
@@ -41,10 +42,9 @@ describe('Two-factor authentication', () => {
 		signinPage.actions.loginWithEmailAndPassword(email, password);
 		personalSettingsPage.actions.enableMfa();
 		mainSidebar.actions.signout();
-		cy.generateToken(user.mfaSecret).then((token) => {
-			mfaLoginPage.actions.loginWithMfaToken(email, password, token);
-			mainSidebar.actions.signout();
-		});
+		const token = generateOTPToken(user.mfaSecret)
+		mfaLoginPage.actions.loginWithMfaToken(email, password, token);
+		mainSidebar.actions.signout();
 	});
 
 	it('Should be able to login with recovery code', () => {
@@ -61,10 +61,9 @@ describe('Two-factor authentication', () => {
 		signinPage.actions.loginWithEmailAndPassword(email, password);
 		personalSettingsPage.actions.enableMfa();
 		mainSidebar.actions.signout();
-		cy.generateToken(user.mfaSecret).then((token) => {
-			mfaLoginPage.actions.loginWithMfaToken(email, password, token);
-			personalSettingsPage.actions.disableMfa();
-			mainSidebar.actions.signout();
-		});
+		const token = generateOTPToken(user.mfaSecret)
+		mfaLoginPage.actions.loginWithMfaToken(email, password, token);
+		personalSettingsPage.actions.disableMfa();
+		mainSidebar.actions.signout();
 	});
 });
diff --git a/cypress/pages/settings-personal.ts b/cypress/pages/settings-personal.ts
index bb738119ca..671b5e21a2 100644
--- a/cypress/pages/settings-personal.ts
+++ b/cypress/pages/settings-personal.ts
@@ -1,6 +1,7 @@
 import { ChangePasswordModal } from './modals/change-password-modal';
 import { MfaSetupModal } from './modals/mfa-setup-modal';
 import { BasePage } from './base';
+import generateOTPToken from 'cypress-otp';
 
 const changePasswordModal = new ChangePasswordModal();
 const mfaSetupModal = new MfaSetupModal();
@@ -61,11 +62,11 @@ export class PersonalSettingsPage extends BasePage {
 			this.getters.enableMfaButton().click();
 			mfaSetupModal.getters.copySecretToClipboardButton().realClick();
 			cy.readClipboard().then((secret) => {
-				cy.generateToken(secret).then((token) => {
-					mfaSetupModal.getters.tokenInput().type(token);
-					mfaSetupModal.getters.downloadRecoveryCodesButton().click();
-					mfaSetupModal.getters.saveButton().click();
-				});
+				const token = generateOTPToken(secret)
+
+				mfaSetupModal.getters.tokenInput().type(token);
+				mfaSetupModal.getters.downloadRecoveryCodesButton().click();
+				mfaSetupModal.getters.saveButton().click();
 			});
 		},
 		disableMfa: () => {
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index 48f2515011..c86db382a3 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -1,7 +1,6 @@
 import 'cypress-real-events';
 import { WorkflowPage } from '../pages';
 import { BACKEND_BASE_URL, N8N_AUTH_COOKIE } from '../constants';
-import generateOTPToken from 'cypress-otp';
 
 Cypress.Commands.add('getByTestId', (selector, ...args) => {
 	return cy.get(`[data-test-id="${selector}"]`, ...args);
@@ -162,7 +161,3 @@ Cypress.Commands.add('draganddrop', (draggableSelector, droppableSelector) => {
 			}
 		});
 });
-
-Cypress.Commands.add('generateToken', (secret: string) => {
-	return generateOTPToken(secret);
-});
diff --git a/cypress/support/index.ts b/cypress/support/index.ts
index bd74453bf8..37140351ff 100644
--- a/cypress/support/index.ts
+++ b/cypress/support/index.ts
@@ -37,7 +37,6 @@ declare global {
 				options?: { abs?: boolean; index?: number; realMouse?: boolean },
 			): void;
 			draganddrop(draggableSelector: string, droppableSelector: string): void;
-			generateToken(mfaSecret: string): Chainable<string>;
 		}
 	}
 }
diff --git a/packages/cli/src/databases/migrations/sqlite/1690000000040-AddMfaColumns.ts b/packages/cli/src/databases/migrations/sqlite/1690000000040-AddMfaColumns.ts
new file mode 100644
index 0000000000..1047f44f5f
--- /dev/null
+++ b/packages/cli/src/databases/migrations/sqlite/1690000000040-AddMfaColumns.ts
@@ -0,0 +1,5 @@
+import { AddMfaColumns1690000000030 as BaseMigration } from '../common/1690000000040-AddMfaColumns';
+
+export class AddMfaColumns1690000000030 extends BaseMigration {
+	transaction = false as const;
+}
diff --git a/packages/cli/src/databases/migrations/sqlite/index.ts b/packages/cli/src/databases/migrations/sqlite/index.ts
index ea5c970cfc..eaf3fd3cb0 100644
--- a/packages/cli/src/databases/migrations/sqlite/index.ts
+++ b/packages/cli/src/databases/migrations/sqlite/index.ts
@@ -41,7 +41,7 @@ import { RemoveSkipOwnerSetup1681134145997 } from './1681134145997-RemoveSkipOwn
 import { FixMissingIndicesFromStringIdMigration1690000000020 } from './1690000000020-FixMissingIndicesFromStringIdMigration';
 import { RemoveResetPasswordColumns1690000000030 } from './1690000000030-RemoveResetPasswordColumns';
 import { CreateWorkflowNameIndex1691088862123 } from '../common/1691088862123-CreateWorkflowNameIndex';
-import { AddMfaColumns1690000000030 } from './../common/1690000000040-AddMfaColumns';
+import { AddMfaColumns1690000000030 } from './1690000000040-AddMfaColumns';
 
 const sqliteMigrations: Migration[] = [
 	InitialMigration1588102412422,