diff --git a/src/hsm/cmd_bip_slip.c b/src/hsm/cmd_bip_slip.c
index ea08c99..20f271c 100644
--- a/src/hsm/cmd_bip_slip.c
+++ b/src/hsm/cmd_bip_slip.c
@@ -317,8 +317,8 @@ int cmd_bip_slip() {
                                  &nodes,
                                  last_node,
                                  &hd_keytype);
-        mbedtls_ecp_keypair_free(&hd_context);
         if (r != CCID_OK) {
+            mbedtls_ecp_keypair_free(&hd_context);
             return SW_EXEC_ERROR();
         }
     }