diff --git a/src/main.rs b/src/main.rs
index c03e7a7..4632b1d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -122,10 +122,7 @@ fn main() -> Result<(), Error> {
         mode = KeepModes::Info;
     } else if args.mode.status {
         mode = KeepModes::Status;
-    } else if args.mode.server.is_some() {
-        mode = KeepModes::Server;
-    } else if settings.get_server_address(&args, &config).is_some() && args.mode.server.is_none() {
-        // If server is configured in config file but not specified via CLI
+    } else if args.mode.server {
         mode = KeepModes::Server;
     }