diff --git a/zingolib/src/commands.rs b/zingolib/src/commands.rs
index c0f00ee83..5216a5d8b 100644
--- a/zingolib/src/commands.rs
+++ b/zingolib/src/commands.rs
@@ -94,7 +94,13 @@ impl Command for ChangeServerCommand {
                     lightclient.set_server(uri);
                     "server set"
                 }
-                Err(_) => "invalid server uri",
+                Err(_) => match args[0] {
+                    "" => {
+                        lightclient.set_server(http::Uri::default());
+                        "server set"
+                    }
+                    _ => "invalid server uri",
+                },
             }
             .to_string(),
             _ => self.help().to_string(),