diff --git a/CHANGELOG.md b/CHANGELOG.md
index 820e259e1..cf102c13a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -83,6 +83,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Do nothing on log insertion conflict [#468](https://github.com/p2panda/aquadoggo/pull/468)
 - Don't update or announce an update in schema provider if a schema with this id exists already [#472](https://github.com/p2panda/aquadoggo/pull/472)
 - Do nothing on document_view insertion conflicts [#474](https://github.com/p2panda/aquadoggo/pull/474)
+- Only over-write `http_port` when cli arg is passed [#489](https://github.com/p2panda/aquadoggo/pull/489)
 
 ### Open Sauce
 
diff --git a/aquadoggo_cli/src/main.rs b/aquadoggo_cli/src/main.rs
index 273865601..077b082d8 100644
--- a/aquadoggo_cli/src/main.rs
+++ b/aquadoggo_cli/src/main.rs
@@ -147,7 +147,9 @@ impl TryFrom<Cli> for Configuration {
             None
         };
 
-        config.http_port = cli.http_port.unwrap_or(2020);
+        if let Some(http_port) = cli.http_port {
+            config.http_port = http_port
+        }
 
         config.network = NetworkConfiguration {
             autonat: cli.autonat.unwrap_or(false),