diff --git a/gui/src-tauri/src/main.rs b/gui/src-tauri/src/main.rs
index 9d9767b9b..b64e6974b 100644
--- a/gui/src-tauri/src/main.rs
+++ b/gui/src-tauri/src/main.rs
@@ -274,12 +274,7 @@ fn setup_tauri(
 
 			app.manage(Mutex::new(window_state));
 
-			if cli.no_start_server {
-				log::info!("Skipping server start.");
-				return Ok(());
-			}
-
-			if server_running() {
+			if cli.skip_server_start_if_running && server_running() {
 				log::info!("Skipping server start: server is already running.");
 				return Ok(());
 			}
diff --git a/gui/src-tauri/src/util.rs b/gui/src-tauri/src/util.rs
index 9a00a2ee0..cb0abd52b 100644
--- a/gui/src-tauri/src/util.rs
+++ b/gui/src-tauri/src/util.rs
@@ -48,7 +48,7 @@ pub struct Cli {
 	#[clap(long)]
 	pub launch_from_path: Option<PathBuf>,
 	#[clap(long)]
-	pub no_start_server: bool,
+	pub skip_server_start_if_running: bool,
 	#[clap(flatten)]
 	verbose: clap_verbosity_flag::Verbosity,
 }