diff --git a/src/Core.UnitTests/Binding/ServerConnectionTests.cs b/src/Core.UnitTests/Binding/ServerConnectionTests.cs
index e792ea4065..600bee3f6b 100644
--- a/src/Core.UnitTests/Binding/ServerConnectionTests.cs
+++ b/src/Core.UnitTests/Binding/ServerConnectionTests.cs
@@ -103,7 +103,7 @@ public void Ctor_SonarQube_SetsProperties()
         sonarQube.ServerUri.Should().BeSameAs(Localhost);
         sonarQube.Settings.Should().BeSameAs(serverConnectionSettings);
         sonarQube.Credentials.Should().BeSameAs(credentials);
-        sonarQube.CredentialsUri.Should().BeSameAs(sonarQube.ServerUri);
+        sonarQube.CredentialsUri.ToString().Should().BeSameAs(sonarQube.Id);
     }
 
     [TestMethod]
diff --git a/src/Core/Binding/ServerConnection.cs b/src/Core/Binding/ServerConnection.cs
index 3a7003412b..7286a304c1 100644
--- a/src/Core/Binding/ServerConnection.cs
+++ b/src/Core/Binding/ServerConnection.cs
@@ -18,7 +18,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-using System.IO;
 using SonarQube.Client.Models;
 
 namespace SonarLint.VisualStudio.Core.Binding;
@@ -32,7 +31,7 @@ public abstract class ServerConnection
     public IConnectionCredentials Credentials { get; set; }
 
     public abstract Uri ServerUri { get; }
-    public abstract Uri CredentialsUri { get; }
+    public Uri CredentialsUri => new(Id);
 
     public static ServerConnection FromBoundSonarQubeProject(BoundSonarQubeProject boundProject) =>
         boundProject switch
@@ -57,13 +56,11 @@ public SonarCloud(string organizationKey, ServerConnectionSettings settings = nu
             : base(OrganizationKeyToId(organizationKey), settings, credentials)
         {
             OrganizationKey = organizationKey;
-            CredentialsUri = new Uri(Id);
         }
 
         public string OrganizationKey { get; }
 
         public override Uri ServerUri => new (SonarCloudUrl);
-        public override Uri CredentialsUri { get; }
 
         private static string OrganizationKeyToId(string organizationKey)
         {
@@ -80,6 +77,5 @@ public sealed class SonarQube(Uri serverUri, ServerConnectionSettings settings =
         : ServerConnection(serverUri?.ToString(), settings, credentials)
     {
         public override Uri ServerUri { get; } = serverUri;
-        public override Uri CredentialsUri { get; } = serverUri;
     }
 }