diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 86f5c0b55..44942911a 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -1676,6 +1676,7 @@ int mbedtls_ssl_set_session(mbedtls_ssl_context *ssl, const mbedtls_ssl_session
                                       session->ciphersuite));
             return MBEDTLS_ERR_SSL_BAD_INPUT_DATA;
         }
+        ssl->handshake->ciphersuite_info = ciphersuite_info;
     }
 #endif /* MBEDTLS_SSL_PROTO_TLS1_3 */
 
@@ -1685,6 +1686,7 @@ int mbedtls_ssl_set_session(mbedtls_ssl_context *ssl, const mbedtls_ssl_session
     }
 
     ssl->handshake->resume = 1;
+    ssl->handshake->key_exchange_mode = MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ALL;
 
     return 0;
 }