diff --git a/VERSION b/VERSION
index c69d1520..b0768f97 100644
--- a/VERSION
+++ b/VERSION
@@ -17,4 +17,5 @@ gitlab:
     driver:     7bee5263
     mbedtls:    1ac9f1f4
     ssl:        eefb383a
-    openssl:    1669353f
\ No newline at end of file
+    openssl:    1669353f
+    nopoll:     31f0ea07
\ No newline at end of file
diff --git a/include/nopoll/nopoll_private.h b/include/nopoll/nopoll_private.h
index 306fb16b..77eb25b8 100644
--- a/include/nopoll/nopoll_private.h
+++ b/include/nopoll/nopoll_private.h
@@ -39,7 +39,7 @@
 #ifndef __NOPOLL_PRIVATE_H__
 #define __NOPOLL_PRIVATE_H__
 
-#include "ssl/ssl_compat-1.0.h"
+#include "openssl/ssl.h"
 #include <nopoll_handlers.h>
 
 typedef struct _noPollCertificate {
diff --git a/lib/libnopoll.a b/lib/libnopoll.a
index 20c8c5ec..c1eedeb9 100644
Binary files a/lib/libnopoll.a and b/lib/libnopoll.a differ
diff --git a/third_party/nopoll/nopoll_conn.c b/third_party/nopoll/nopoll_conn.c
index 42f0faca..680a29c7 100644
--- a/third_party/nopoll/nopoll_conn.c
+++ b/third_party/nopoll/nopoll_conn.c
@@ -704,7 +704,7 @@ noPollConn * __nopoll_conn_new_common (noPollCtx       * ctx,
 	if (enable_tls) {
 		/* found TLS connection request, enable it */
 		conn->ssl_ctx  = __nopoll_conn_get_ssl_context (ctx, conn, options, nopoll_true);
-
+		SSL_CTX_set_default_read_buffer_len(conn->ssl_ctx, 4096);
 		/* check for client side SSL configuration */
 		if (! __nopoll_conn_set_ssl_client_options (ctx, conn, options)) {
 			nopoll_log (ctx, NOPOLL_LEVEL_CRITICAL, "Unable to configure additional SSL options, unable to continue",
@@ -804,7 +804,6 @@ noPollConn * __nopoll_conn_new_common (noPollCtx       * ctx,
 
 			return conn;
 		}
-		X509_free (server_cert);
 
 		/* call to check post ssl checks after SSL finalization */
 		if (conn->ctx && conn->ctx->post_ssl_check) {
diff --git a/third_party/nopoll/nopoll_conn_opts.c b/third_party/nopoll/nopoll_conn_opts.c
index c5a4b7d7..c0bcf103 100644
--- a/third_party/nopoll/nopoll_conn_opts.c
+++ b/third_party/nopoll/nopoll_conn_opts.c
@@ -122,21 +122,9 @@ nopoll_bool        nopoll_conn_opts_set_ssl_certs    (noPollConnOpts * opts,
 	
 	/* store certificate settings */
 	opts->certificate        = nopoll_strdup (certificate);
-	if (opts->certificate)
-//		if (access (opts->certificate, R_OK) != 0)
-//			return nopoll_false;
 	opts->private_key        = nopoll_strdup (private_key);
-	if (opts->private_key)
-//		if (access (opts->private_key, R_OK) != 0)
-//			return nopoll_false;
 	opts->chain_certificate  = nopoll_strdup (chain_certificate);
-	if (opts->chain_certificate)
-//		if (access (opts->chain_certificate, R_OK) != 0)
-//			return nopoll_false;
 	opts->ca_certificate     = nopoll_strdup (ca_certificate);
-	if (opts->ca_certificate)
-//		if (access (opts->ca_certificate, R_OK) != 0)
-//			return nopoll_false;
 
 	return nopoll_true;
 }