diff --git a/uppsrc/Core/SSL/InitExit.cpp b/uppsrc/Core/SSL/InitExit.cpp
index 67d3d8b41..5f2c6cd6b 100644
--- a/uppsrc/Core/SSL/InitExit.cpp
+++ b/uppsrc/Core/SSL/InitExit.cpp
@@ -89,9 +89,11 @@ INITIALIZER(SSL)
 	LLOG("SslInit");
 	TcpSocketInit();
 #ifdef UPP_HEAP
+#ifndef flagSSL_USEMALLOC // do not change OpenSSL memory functions to U++ heap
 #ifndef _DEBUG // temporary solution unless we find the source of all those harmless leaks
 	CRYPTO_set_mem_functions(SslAlloc, SslRealloc, SslFree);
 #endif
+#endif
 #endif
 	SSL_library_init();
 	SSL_load_error_strings();