diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index ac53853a5..32fa8e3d3 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -6029,6 +6029,10 @@ int mbedtls_ssl_config_defaults(mbedtls_ssl_config *conf,
  */
 void mbedtls_ssl_config_free(mbedtls_ssl_config *conf)
 {
+    if (conf == NULL) {
+        return;
+    }
+
 #if defined(MBEDTLS_DHM_C)
     mbedtls_mpi_free(&conf->dhm_P);
     mbedtls_mpi_free(&conf->dhm_G);