diff --git a/build/Dockerfile b/build/Dockerfile
index 1ad06ba986..05fb37fa90 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -79,7 +79,7 @@ RUN cd /opt/ && curl -L https://github.com/facebook/rocksdb/archive/v6.10.1.tar.
 RUN cd /opt/ && curl -L https://github.com/manticoresoftware/manticoresearch/raw/master/misc/junit/ctest2junit.xsl -o ctest2junit.xsl
 
 # Setting this environment variable switches from OpenSSL to BoringSSL
-#ENV OPENSSL_ROOT_DIR=/opt/boringssl
+ENV OPENSSL_ROOT_DIR=/opt/boringssl
 
 # install BoringSSL:  TODO: They don't seem to have releases(?)  I picked today's master SHA.
 RUN cd /opt &&\
diff --git a/flow/TLSConfig.actor.cpp b/flow/TLSConfig.actor.cpp
index 73a336e38a..e97c9dbc9d 100644
--- a/flow/TLSConfig.actor.cpp
+++ b/flow/TLSConfig.actor.cpp
@@ -28,9 +28,7 @@ TLSPolicy::~TLSPolicy() {}
 namespace TLS {
 
 void DisableOpenSSLAtExitHandler() {
-#ifdef TLS_DISABLED
-	return;
-#else
+#ifdef HAVE_OPENSSL_INIT_NO_ATEXIT
 	static bool once = false;
 	if (!once) {
 		once = true;
@@ -43,9 +41,7 @@ void DisableOpenSSLAtExitHandler() {
 }
 
 void DestroyOpenSSLGlobalState() {
-#ifdef TLS_DISABLED
-	return;
-#else
+#ifdef HAVE_OPENSSL_INIT_NO_ATEXIT
 	OPENSSL_cleanup();
 #endif
 }