diff --git a/client/src/cmdlfem4x.c b/client/src/cmdlfem4x.c
index 5e008b369..242c37307 100644
--- a/client/src/cmdlfem4x.c
+++ b/client/src/cmdlfem4x.c
@@ -1694,20 +1694,16 @@ static void unlock_add_item(em4x05_unlock_item_t *array, uint8_t len, uint32_t v
     
     uint8_t i = 0;
     for (; i < len; i++) {
-        if ( array[i].cnt == 0)
-            break;
-        
-        if ( array[i].value == value) {
+        if ( array[i].value == value ) {
             array[i].cnt++;
-            return;
+            break;
+        }
+        if ( array[i].cnt == 0 ) {
+            array[i].cnt++;
+            array[i].value = value;
+            break;
         }
     }
-
-    if (i >= len ) 
-        return;
-        
-    array[i].cnt++;
-    array[i].value = value;    
 }
 
 static int CmdEM4x05Unlock(const char *Cmd) {