diff --git a/squeaknode/config/config.py b/squeaknode/config/config.py
index f2ec3303..0830b8bd 100644
--- a/squeaknode/config/config.py
+++ b/squeaknode/config/config.py
@@ -106,7 +106,7 @@ class TorConfig(Config):
 class ServerConfig(Config):
     enabled = key(cast=bool, required=False, default=True)
     host = key(cast=str, required=False, default=DEFAULT_SERVER_RPC_HOST)
-    port = key(cast=int, required=False, default=DEFAULT_SERVER_RPC_PORT)
+    port = key(cast=int, required=False, default=0)
     external_address = key(cast=str, required=False, default="")
     external_port = key(cast=int, required=False,
                         default=DEFAULT_EXTERNAL_PORT)
diff --git a/squeaknode/node/squeak_node.py b/squeaknode/node/squeak_node.py
index ad06d998..abe5044f 100644
--- a/squeaknode/node/squeak_node.py
+++ b/squeaknode/node/squeak_node.py
@@ -228,7 +228,7 @@ class SqueakNode:
     def create_peer_web_server(self):
         self.peer_web_server = SqueakPeerWebServer(
             self.config.server.host,
-            squeak.params.params.DEFAULT_PORT,
+            self.config.server.port or squeak.params.params.DEFAULT_PORT,
             self.peer_handler,
         )
 
diff --git a/tests/node/test_squeak_controller.py b/tests/node/test_squeak_controller.py
index 5273e17c..594ac7e3 100644
--- a/tests/node/test_squeak_controller.py
+++ b/tests/node/test_squeak_controller.py
@@ -167,5 +167,5 @@ def test_create_peer(squeak_store, squeak_controller, peer_address):
     squeak_store.create_peer.assert_called_with(
         "fake_peer_name",
         peer_address,
-        8555,
+        0,
     )