diff --git a/Stack/Opc.Ua.Core/Stack/Https/HttpsListener.cs b/Stack/Opc.Ua.Core/Stack/Https/HttpsListener.cs
index d9059a3bef..7495d99719 100644
--- a/Stack/Opc.Ua.Core/Stack/Https/HttpsListener.cs
+++ b/Stack/Opc.Ua.Core/Stack/Https/HttpsListener.cs
@@ -195,7 +195,7 @@ namespace Opc.Ua.Bindings
             m_host.UseKestrel(options =>
             {
                 options.NoDelay = true;
-                //options.UseHttps(httpsOptions);
+                options.UseHttps(httpsOptions);
             });
 
             m_host.UseContentRoot(Directory.GetCurrentDirectory());
diff --git a/Stack/Opc.Ua.Core/Stack/Https/HttpsTransportChannel.cs b/Stack/Opc.Ua.Core/Stack/Https/HttpsTransportChannel.cs
index a0fa12988d..e493178237 100644
--- a/Stack/Opc.Ua.Core/Stack/Https/HttpsTransportChannel.cs
+++ b/Stack/Opc.Ua.Core/Stack/Https/HttpsTransportChannel.cs
@@ -204,7 +204,7 @@ namespace Opc.Ua.Bindings
         
         private void SaveSettings(Uri url, TransportChannelSettings settings)
         {
-            m_url = new Uri(Utils.ReplaceLocalhost(url.ToString().Replace("https", "http")));
+            m_url = new Uri(Utils.ReplaceLocalhost(url.ToString()));
 
             m_settings = settings;
             m_operationTimeout = settings.Configuration.OperationTimeout;