diff --git a/src/hsm/eac.c b/src/hsm/eac.c
index 3bee3e9..fb28c55 100644
--- a/src/hsm/eac.c
+++ b/src/hsm/eac.c
@@ -57,6 +57,7 @@ void sm_derive_all_keys(const uint8_t *derived, size_t derived_len) {
     mbedtls_mpi_grow(&sm_mSSC, sm_blocksize);
     mbedtls_mpi_lset(&sm_mSSC, 0);
     memset(sm_iv, 0, sizeof(sm_iv));
+    sm_session_pin_len = 0;
 }
 
 void sm_set_protocol(MSE_protocol proto) {
diff --git a/src/hsm/sc_hsm.c b/src/hsm/sc_hsm.c
index fb4091f..5bcdba4 100644
--- a/src/hsm/sc_hsm.c
+++ b/src/hsm/sc_hsm.c
@@ -75,6 +75,7 @@ void init_sc_hsm() {
 int sc_hsm_unload() {
     has_session_pin = has_session_sopin = false;
     isUserAuthenticated = false;
+    sm_session_pin_len = 0;
     return HSM_OK;
 }