diff --git a/src/ServiceControl.Config/UI/AdvancedOptions/ServiceControlAdvancedView.xaml b/src/ServiceControl.Config/UI/AdvancedOptions/ServiceControlAdvancedView.xaml
index 896125aca5..00da1aaecd 100644
--- a/src/ServiceControl.Config/UI/AdvancedOptions/ServiceControlAdvancedView.xaml
+++ b/src/ServiceControl.Config/UI/AdvancedOptions/ServiceControlAdvancedView.xaml
@@ -54,12 +54,12 @@
                            Visibility="{Binding InMaintenanceMode, Converter={StaticResource boolToVis}}"
                            Margin="0,0,0,20"
                 >
-                This instance is in database maintenance mode. All message processing is disabled and the REST API is unavailable.<LineBreak />ServicePulse and ServiceInsight cannot connect to this instance while it is in maintenance mode.<LineBreak />Launch <Hyperlink Command="{Binding OpenUrl}" CommandParameter="{Binding StorageUrl}">
+                This instance is in database maintenance mode. All message processing is disabled and the REST API is unavailable.<LineBreak />ServicePulse and ServiceInsight cannot connect to this instance while it is in maintenance mode.<LineBreak />Launch <Hyperlink Command="{Binding OpenUrl}" CommandParameter="{Binding RavenDbStudioUrl}">
                         RavenDB Management Studio
                         <Hyperlink.ContextMenu>
                             <ContextMenu>
                                 <MenuItem Command="{Binding CopyToClipboard}"
-                                          CommandParameter="{Binding StorageUrl}"
+                                          CommandParameter="{Binding RavenDbStudioUrl}"
                                           Header="Copy to Clipboard" />
                             </ContextMenu>
                         </Hyperlink.ContextMenu>
diff --git a/src/ServiceControl.Config/UI/AdvancedOptions/ServiceControlAdvancedViewModel.cs b/src/ServiceControl.Config/UI/AdvancedOptions/ServiceControlAdvancedViewModel.cs
index 06a650ce21..3bfed4981f 100644
--- a/src/ServiceControl.Config/UI/AdvancedOptions/ServiceControlAdvancedViewModel.cs
+++ b/src/ServiceControl.Config/UI/AdvancedOptions/ServiceControlAdvancedViewModel.cs
@@ -81,7 +81,7 @@ ForceUpgradeAuditInstanceCommand forceUpgradeAuditCommand
 
         public bool InMaintenanceMode => ServiceControlInstance.InMaintenanceMode;
 
-        public string StorageUrl => ServiceControlInstance.StorageUrl;
+        public string RavenStudioUrl => ServiceControlInstance.RavenDbStudioUrl;
 
         public bool IsRunning
         {
diff --git a/src/ServiceControlInstaller.Engine/Instances/ServiceControlBaseService.cs b/src/ServiceControlInstaller.Engine/Instances/ServiceControlBaseService.cs
index eb9e8f8f97..5e2a3a762f 100644
--- a/src/ServiceControlInstaller.Engine/Instances/ServiceControlBaseService.cs
+++ b/src/ServiceControlInstaller.Engine/Instances/ServiceControlBaseService.cs
@@ -32,16 +32,12 @@ protected ServiceControlBaseService(IWindowsServiceController service)
         /// <summary>
         /// Raven management URL
         /// </summary>
-        public string StorageUrl
+        public string RavenDbStudioUrl
         {
             get
             {
-                string host = HostName switch
-                {
-                    "*" or "+" => "localhost",
-                    _ => HostName,
-                };
-                return $"http://{host}:{DatabaseMaintenancePort}/studio/index.html#databases";
+                var port = DatabaseMaintenancePort ?? 33334;
+                return $"http://localhost:{port}/studio/index.html#databases";
             }
         }