diff --git a/src/hsm/cmd_key_domain.c b/src/hsm/cmd_key_domain.c
index d3285b3..39a6037 100644
--- a/src/hsm/cmd_key_domain.c
+++ b/src/hsm/cmd_key_domain.c
@@ -66,7 +66,7 @@ int cmd_key_domain() {
         }
         else {
             file_t *tf = search_dynamic_file(EF_XKEK+p2);
-            if (2*p2 >= tf_kd_size)
+            if (2*p2 >= tf_kd_size || current_dkeks == 0)
                 return SW_INCORRECT_P1P2();
             if (current_dkeks == 0xff && !tf) //XKEK have always 0xff
                 return SW_REFERENCE_NOT_FOUND();