diff --git a/packages/lib/BaseApplication.ts b/packages/lib/BaseApplication.ts
index 3357b4c8df0..f4519574815 100644
--- a/packages/lib/BaseApplication.ts
+++ b/packages/lib/BaseApplication.ts
@@ -192,6 +192,12 @@ export default class BaseApplication {
 				continue;
 			}
 
+			if (arg === '--safe-mode') {
+				matched.isSafeMode = true;
+				argv.splice(0, 1);
+				continue;
+			}
+
 			if (arg === '--open-dev-tools') {
 				Setting.setConstant('flagOpenDevTools', true);
 				argv.splice(0, 1);
@@ -829,6 +835,10 @@ export default class BaseApplication {
 
 		appLogger.info(`Client ID: ${Setting.value('clientId')}`);
 
+		if (initArgs?.isSafeMode) {
+			Setting.setValue('isSafeMode', true);
+		}
+
 		if (Setting.value('firstStart')) {
 			// If it's a sub-profile, the locale must come from the root
 			// profile.