diff --git a/Utilities/SilKitRegistry/Registry.cpp b/Utilities/SilKitRegistry/Registry.cpp
index aee0d1d98..325990141 100755
--- a/Utilities/SilKitRegistry/Registry.cpp
+++ b/Utilities/SilKitRegistry/Registry.cpp
@@ -156,6 +156,14 @@ void OverrideFromRegistryConfiguration(std::shared_ptr<SilKit::Config::IParticip
     }
 }
 
+void OverrideRegistryUri(std::shared_ptr<SilKit::Config::IParticipantConfiguration> configuration, const std::string& registryUri)
+{
+    auto config = std::dynamic_pointer_cast<SilKit::Config::ParticipantConfiguration>(configuration);
+    SILKIT_ASSERT(config != nullptr);
+
+    config->middleware.registryUri = registryUri;
+}
+
 void SanitizeConfiguration(std::shared_ptr<SilKit::Config::IParticipantConfiguration> configuration,
                            const std::string& listenUri)
 {
@@ -212,6 +220,8 @@ auto StartRegistry(std::shared_ptr<SilKit::Config::IParticipantConfiguration> co
 
     std::cout << "SIL Kit Registry listening on " << chosenListenUri << std::endl;
 
+    OverrideRegistryUri(configuration, chosenListenUri);
+
     if (generatedConfigurationPathOpt.HasValue())
     {
         const auto generatedConfigurationPath = generatedConfigurationPathOpt.Value();
diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
index b690ea5ec..68b02be23 100644
--- a/docs/CHANGELOG.rst
+++ b/docs/CHANGELOG.rst
@@ -7,6 +7,16 @@ All notable changes to the Vector SIL Kit project shall be documented in this fi
 The format is based on `Keep a Changelog (http://keepachangelog.com/en/1.0.0/) <http://keepachangelog.com/en/1.0.0/>`_.
 
 
+[4.0.45] - UNRELEASED
+---------------------
+
+Fixed
+~~~~~
+
+- Registry failed to start correctly, if the dashboard is enabled, but the registry is letting the
+  system determine the listening port, e.g., when using a URI like ``silkit://localhost:0``.
+
+
 [4.0.44] - 2024-01-22
 ---------------------