diff --git a/src/libopensc/card-sc-hsm.c b/src/libopensc/card-sc-hsm.c
index 5832b425..475f2c25 100644
--- a/src/libopensc/card-sc-hsm.c
+++ b/src/libopensc/card-sc-hsm.c
@@ -217,6 +217,12 @@ static int sc_hsm_pin_cmd(sc_card_t *card, struct sc_pin_cmd_data *data,
 
 		LOG_FUNC_RETURN(card->ctx, SC_SUCCESS);
 	}
+
+	data->pin1.offset = 5;
+	data->pin1.length_offset = 4;
+	data->pin2.offset = 5;
+	data->pin2.length_offset = 4;
+
 	return (*iso_ops->pin_cmd)(card, data, tries_left);
 }