diff --git a/Firmware/Chameleon-Mini/Terminal/Commands.c b/Firmware/Chameleon-Mini/Terminal/Commands.c
index 68f4b0bf..78f8a156 100644
--- a/Firmware/Chameleon-Mini/Terminal/Commands.c
+++ b/Firmware/Chameleon-Mini/Terminal/Commands.c
@@ -661,7 +661,10 @@ CommandStatusIdType CommandExecAutocalibrate(char *OutMessage) {
     }
 #endif
 #ifdef CONFIG_ISO15693_SNIFF_SUPPORT
-    if (GlobalSettings.ActiveSettingPtr->Configuration == CONFIG_ISO15693_SNIFF) {
+    /* Only execute autocalibration if the codec does not use autothreshold */
+    /* It needs to be disabled by the AUTOTHRESHOLD=DISABLE command */
+    if ((GlobalSettings.ActiveSettingPtr->Configuration == CONFIG_ISO15693_SNIFF) &&
+        (SniffISO15693GetAutoThreshold() == false)){
         ApplicationReset();
 
         Sniff15693CurrentCommand = Sniff15693_Autocalibrate;