diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 73c3a746c..227476a22 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -6570,14 +6570,6 @@ void mbedtls_ssl_free( mbedtls_ssl_context *ssl )
         mbedtls_free( ssl->session );
     }
 
-#if defined(MBEDTLS_SSL_SESSION_TICKETS)
-    if( ssl->conf->ticket_keys )
-    {
-        ssl_ticket_keys_free( ssl->conf->ticket_keys );
-        mbedtls_free( ssl->conf->ticket_keys );
-    }
-#endif
-
 #if defined(MBEDTLS_X509_CRT_PARSE_C)
     if( ssl->hostname != NULL )
     {
@@ -6733,6 +6725,14 @@ void mbedtls_ssl_config_free( mbedtls_ssl_config *conf )
     }
 #endif
 
+#if defined(MBEDTLS_SSL_SESSION_TICKETS)
+    if( conf->ticket_keys )
+    {
+        ssl_ticket_keys_free( conf->ticket_keys );
+        mbedtls_free( conf->ticket_keys );
+    }
+#endif
+
 #if defined(MBEDTLS_X509_CRT_PARSE_C)
     ssl_key_cert_free( conf->key_cert );
 #endif