diff --git a/src/Core/Utilities/CoreHelpers.cs b/src/Core/Utilities/CoreHelpers.cs
index 369dba4dc9..684e49448d 100644
--- a/src/Core/Utilities/CoreHelpers.cs
+++ b/src/Core/Utilities/CoreHelpers.cs
@@ -658,9 +658,9 @@ namespace Bit.Core.Utilities
                     var uri = new Uri(val);
                     dictReplace.Add(item.Key, string.Concat(publicServiceUri, uri.LocalPath));
                 }
-                else if (item.Key == "jwks_uri" && item.Value is string jwksVal)
+                else if ((item.Key == "jwks_uri" || item.Key.EndsWith("_endpoint")) && item.Value is string val2)
                 {
-                    var uri = new Uri(jwksVal);
+                    var uri = new Uri(val2);
                     dictReplace.Add(item.Key, string.Concat(internalServiceUri, uri.LocalPath));
                 }
             }