diff --git a/bcda/client/bluebutton.go b/bcda/client/bluebutton.go
index adc3da817..98764c73e 100644
--- a/bcda/client/bluebutton.go
+++ b/bcda/client/bluebutton.go
@@ -107,7 +107,6 @@ func NewBlueButtonClient(config BlueButtonConfig) (*BlueButtonClient, error) {
 		logger.Warn("Blue Button certificate check disabled")
 	}
 
-	tlsConfig.BuildNameToCertificate()
 	transport := &http.Transport{
 		TLSClientConfig: tlsConfig,
 		// Ensure that we have compression enabled. This allows the transport to request for gzip content