diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h
index fa56eb709..63c2f4f9a 100644
--- a/include/mbedtls/check_config.h
+++ b/include/mbedtls/check_config.h
@@ -962,10 +962,6 @@
 #error "MBEDTLS_SSL_VARIABLE_BUFFER_LENGTH defined, but not all prerequisites"
 #endif
 
-#if defined(MBEDTLS_SSL_SESSION_TICKETS) && !( defined(MBEDTLS_GCM_C) || defined(MBEDTLS_CCM_C) || defined(MBEDTLS_CHACHAPOLY_C) || defined(MBEDTLS_NIST_KW_C) )
-#error "MBEDTLS_SSL_SESSION_TICKETS defined, but not all prerequisites"
-#endif
-
 #if defined(MBEDTLS_SSL_CONTEXT_SERIALIZATION) && !( defined(MBEDTLS_GCM_C) || defined(MBEDTLS_CCM_C) || defined(MBEDTLS_CHACHAPOLY_C) )
 #error "MBEDTLS_SSL_CONTEXT_SERIALIZATION defined, but not all prerequisites"
 #endif
diff --git a/library/ssl_ticket.c b/library/ssl_ticket.c
index 5398c3970..359686afa 100644
--- a/library/ssl_ticket.c
+++ b/library/ssl_ticket.c
@@ -114,7 +114,6 @@ static int ssl_ticket_gen_key( mbedtls_ssl_ticket_context *ctx,
 /*
  * Rotate/generate keys if necessary
  */
-#if defined(MBEDTLS_CIPHER_MODE_AEAD) || defined(MBEDTLS_NIST_KW_C)
 MBEDTLS_CHECK_RETURN_CRITICAL
 static int ssl_ticket_update_keys( mbedtls_ssl_ticket_context *ctx )
 {
@@ -151,7 +150,6 @@ static int ssl_ticket_update_keys( mbedtls_ssl_ticket_context *ctx )
 #endif /* MBEDTLS_HAVE_TIME */
         return( 0 );
 }
-#endif
 
 /*
  * Rotate active session ticket encryption key
@@ -295,7 +293,7 @@ int mbedtls_ssl_ticket_setup( mbedtls_ssl_ticket_context *ctx,
  * The key_name, iv, and length of encrypted_state are the additional
  * authenticated data.
  */
-#if defined(MBEDTLS_CIPHER_MODE_AEAD) || defined(MBEDTLS_NIST_KW_C)
+
 int mbedtls_ssl_ticket_write( void *p_ticket,
                               const mbedtls_ssl_session *session,
                               unsigned char *start,
@@ -392,9 +390,7 @@ cleanup:
 
     return( ret );
 }
-#endif
 
-#if defined(MBEDTLS_CIPHER_MODE_AEAD) || defined(MBEDTLS_NIST_KW_C)
 /*
  * Select key based on name
  */
@@ -521,7 +517,6 @@ cleanup:
 
     return( ret );
 }
-#endif
 
 /*
  * Free context