diff --git a/packages/server/src/cli.ts b/packages/server/src/cli.ts
index 84d53367e7bc..59064b46c86d 100644
--- a/packages/server/src/cli.ts
+++ b/packages/server/src/cli.ts
@@ -166,6 +166,24 @@ if (isCli) {
 		password = buffer.toString("hex");
 	}
 
+	// If CLI password was provided, obsfucate password from process title
+	if (options.password) {
+		const parts = [process.title];
+		for (let i = 2; i < process.argv.length; i++) {
+			if (process.argv[i].startsWith("--password=")) {
+				parts.push(process.argv[i].replace(/=.*/, "=****"));
+			} else if (process.argv[i] === "--password") {
+				parts.push(process.argv[i++], "****")
+			} else if (process.argv[i] === "--") {
+				parts.push(...process.argv.slice(i));
+				break;
+			} else {
+				parts.push(process.argv[i]);
+			}
+		}
+		process.title = parts.join(" ");
+	}
+
 	const hasCustomHttps = certData && certKeyData;
 	const app = await createApp({
 		allowHttp: options.allowHttp,