diff --git a/Applications/ConsoleReferenceServer/Quickstarts.ReferenceServer.Config.xml b/Applications/ConsoleReferenceServer/Quickstarts.ReferenceServer.Config.xml
index 59d17b5901..6255b65dba 100644
--- a/Applications/ConsoleReferenceServer/Quickstarts.ReferenceServer.Config.xml
+++ b/Applications/ConsoleReferenceServer/Quickstarts.ReferenceServer.Config.xml
@@ -14,7 +14,7 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC Foundation/pki/own</StorePath>
+      <StorePath>%LocalApplicationData%/OPC Foundation/pki/own</StorePath>      
       <SubjectName>CN=Quickstart Reference Server, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
@@ -77,6 +77,7 @@
     <BaseAddresses>
       <ua:String>opc.https://localhost:62540/Quickstarts/ReferenceServer</ua:String>
       <ua:String>opc.tcp://localhost:62541/Quickstarts/ReferenceServer</ua:String>
+      <!--<ua:String>https://localhost:62542/Quickstarts/ReferenceServer</ua:String>-->
     </BaseAddresses>
     <!-- 
     These list the alternate addresses (via firewalls, multiple NICs etc.) that can be
diff --git a/Stack/Opc.Ua.Bindings.Https/Stack/Https/HttpsServiceHost.cs b/Stack/Opc.Ua.Bindings.Https/Stack/Https/HttpsServiceHost.cs
index f76c18d2ee..036002851b 100644
--- a/Stack/Opc.Ua.Bindings.Https/Stack/Https/HttpsServiceHost.cs
+++ b/Stack/Opc.Ua.Bindings.Https/Stack/Https/HttpsServiceHost.cs
@@ -73,6 +73,11 @@ X509Certificate2Collection instanceCertificateChain
                     continue;
                 }
 
+                if (!baseAddresses[ii].StartsWith(UriScheme, StringComparison.Ordinal))
+                {
+                    continue;
+                }
+
                 UriBuilder uri = new UriBuilder(baseAddresses[ii]);
 
                 if (uri.Path[uri.Path.Length - 1] != '/')