diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8cfccb99..9b94013db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Fix DESFire mis-annotation (@VortixDev)
  - Change `lf pac demod` - now also search for inverted bitstreams (@iceman1001)
  - Change `hf 14b reader` - now supports continous mode (@iceman1001)
  - Fix `hf search` - now doesn't false identify ISO15693 (@iceman1001)
diff --git a/client/src/cmdhflist.c b/client/src/cmdhflist.c
index baf60406d..be2dfa4eb 100644
--- a/client/src/cmdhflist.c
+++ b/client/src/cmdhflist.c
@@ -776,6 +776,8 @@ void annotateMfDesfire(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) {
                 pos++;
 
             for (uint8_t i = 0; i < 2; i++, pos++) {
+                bool found_annotation = true;
+                
                 switch (cmd[pos]) {
                     case MFDES_CREATE_APPLICATION:
                         snprintf(exp, size, "CREATE APPLICATION");
@@ -892,8 +894,13 @@ void annotateMfDesfire(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) {
                         snprintf(exp, size, "READ SIGNATURE");
                         break;
                     default:
+                        found_annotation = false;
                         break;
                 }
+                
+                if (found_annotation) {
+                    break;
+                }
             }
         } else {
             // anything else