diff --git a/client/src/cmdhfmfdes.c b/client/src/cmdhfmfdes.c
index 363a2f946..035e52cea 100644
--- a/client/src/cmdhfmfdes.c
+++ b/client/src/cmdhfmfdes.c
@@ -2843,7 +2843,7 @@ static int CmdHF14ADesCreateApp(const char *Cmd) {
     DesfireContext dctx;
     int securechann = defaultSecureChannel;
     uint32_t appid = 0x000000;
-    int res = CmdDesGetSessionParameters(ctx, &dctx, 3, 4, 5, 6, 7, 8, 9, 10, 12, &securechann, DCMPlain, &appid);
+    int res = CmdDesGetSessionParameters(ctx, &dctx, 3, 4, 5, 6, 7, 8, 9, 10, 12, &securechann, DCMMACed, &appid);
     if (res) {
         CLIParserFree(ctx);
         return res;
@@ -3007,7 +3007,7 @@ static int CmdHF14ADesDeleteApp(const char *Cmd) {
     DesfireContext dctx;
     int securechann = defaultSecureChannel;
     uint32_t appid = 0x000000;
-    int res = CmdDesGetSessionParameters(ctx, &dctx, 3, 4, 5, 6, 7, 8, 9, 10, 11, &securechann, DCMPlain, &appid);
+    int res = CmdDesGetSessionParameters(ctx, &dctx, 3, 4, 5, 6, 7, 8, 9, 10, 11, &securechann, DCMMACed, &appid);
     if (res) {
         CLIParserFree(ctx);
         return res;
@@ -3342,7 +3342,7 @@ static int CmdHF14ADesGetKeyVersions(const char *Cmd) {
     DesfireContext dctx;
     int securechann = defaultSecureChannel;
     uint32_t appid = 0x000000;
-    int res = CmdDesGetSessionParameters(ctx, &dctx, 3, 4, 5, 6, 7, 8, 9, 10, 11, &securechann, DCMPlain, &appid); // DCMMACed
+    int res = CmdDesGetSessionParameters(ctx, &dctx, 3, 4, 5, 6, 7, 8, 9, 10, 11, &securechann, DCMMACed, &appid);
     if (res) {
         CLIParserFree(ctx);
         return res;
@@ -4632,7 +4632,7 @@ static int CmdHF14ADesDeleteFile(const char *Cmd) {
     DesfireContext dctx;
     int securechann = defaultSecureChannel;
     uint32_t appid = 0x000000;
-    int res = CmdDesGetSessionParameters(ctx, &dctx, 3, 4, 5, 6, 7, 8, 9, 10, 11, &securechann, DCMPlain, &appid);
+    int res = CmdDesGetSessionParameters(ctx, &dctx, 3, 4, 5, 6, 7, 8, 9, 10, 11, &securechann, DCMMACed, &appid);
     if (res) {
         CLIParserFree(ctx);
         return res;
@@ -4869,7 +4869,7 @@ static int CmdHF14ADesClearRecordFile(const char *Cmd) {
     DesfireContext dctx;
     int securechann = defaultSecureChannel;
     uint32_t appid = 0x000000;
-    int res = CmdDesGetSessionParameters(ctx, &dctx, 3, 4, 5, 6, 7, 8, 9, 10, 11, &securechann, DCMPlain, &appid);
+    int res = CmdDesGetSessionParameters(ctx, &dctx, 3, 4, 5, 6, 7, 8, 9, 10, 11, &securechann, DCMMACed, &appid);
     if (res) {
         CLIParserFree(ctx);
         return res;
@@ -5268,7 +5268,7 @@ static int CmdHF14ADesWriteData(const char *Cmd) {
         FileSettingsS fsettings;
 
         DesfireCommunicationMode commMode = dctx.commMode;
-        DesfireSetCommMode(&dctx, DCMPlain);
+        DesfireSetCommMode(&dctx, DCMMACed);
         res = DesfireGetFileSettingsStruct(&dctx, fnum, &fsettings);
         DesfireSetCommMode(&dctx, commMode);
 
@@ -5431,7 +5431,7 @@ static int CmdHF14ADesLsFiles(const char *Cmd) {
     DesfireContext dctx;
     int securechann = defaultSecureChannel;
     uint32_t appid = 0x000000;
-    int res = CmdDesGetSessionParameters(ctx, &dctx, 3, 4, 5, 6, 7, 8, 9, 10, 11, &securechann, DCMPlain, &appid);
+    int res = CmdDesGetSessionParameters(ctx, &dctx, 3, 4, 5, 6, 7, 8, 9, 10, 11, &securechann, DCMMACed, &appid);
     if (res) {
         CLIParserFree(ctx);
         return res;
@@ -5503,7 +5503,7 @@ static int CmdHF14ADesLsApp(const char *Cmd) {
 
     DesfireContext dctx;
     int securechann = defaultSecureChannel;
-    int res = CmdDesGetSessionParameters(ctx, &dctx, 3, 4, 5, 6, 7, 8, 9, 10, 0, &securechann, DCMPlain, NULL);
+    int res = CmdDesGetSessionParameters(ctx, &dctx, 3, 4, 5, 6, 7, 8, 9, 10, 0, &securechann, (noauth) ? DCMPlain : DCMMACed, NULL);
     if (res) {
         CLIParserFree(ctx);
         return res;
@@ -5566,7 +5566,7 @@ static int CmdHF14ADesDump(const char *Cmd) {
     DesfireContext dctx;
     int securechann = defaultSecureChannel;
     uint32_t appid = 0x000000;
-    int res = CmdDesGetSessionParameters(ctx, &dctx, 3, 4, 5, 6, 7, 8, 9, 10, 11, &securechann, DCMPlain, &appid);
+    int res = CmdDesGetSessionParameters(ctx, &dctx, 3, 4, 5, 6, 7, 8, 9, 10, 11, &securechann, (noauth) ? DCMPlain : DCMMACed, &appid);
     if (res) {
         CLIParserFree(ctx);
         return res;
diff --git a/client/src/mifare/desfiresecurechan.c b/client/src/mifare/desfiresecurechan.c
index 57306c1c2..b33287a00 100644
--- a/client/src/mifare/desfiresecurechan.c
+++ b/client/src/mifare/desfiresecurechan.c
@@ -42,26 +42,22 @@ static bool CommandCanUseAnyChannel(uint8_t cmd) {
 
 static const AllowedChannelModesS AllowedChannelModes[] = {
     {MFDES_SELECT_APPLICATION,        DACd40,  DCCNative,    DCMPlain},
-    {MFDES_CREATE_APPLICATION,        DACd40,  DCCNative,    DCMPlain},
-    {MFDES_DELETE_APPLICATION,        DACd40,  DCCNative,    DCMPlain},
-    {MFDES_GET_APPLICATION_IDS,       DACd40,  DCCNative,    DCMPlain},
-    {MFDES_GET_DF_NAMES,              DACd40,  DCCNative,    DCMPlain},
-    {MFDES_GET_KEY_SETTINGS,          DACd40,  DCCNative,    DCMPlain},
-    {MFDES_GET_KEY_VERSION,           DACd40,  DCCNative,    DCMPlain},
-    {MFDES_GET_FREE_MEMORY,           DACd40,  DCCNative,    DCMPlain},
-    {MFDES_CREATE_STD_DATA_FILE,      DACd40,  DCCNative,    DCMPlain},
-    {MFDES_CREATE_BACKUP_DATA_FILE,   DACd40,  DCCNative,    DCMPlain},
-    {MFDES_CREATE_VALUE_FILE,         DACd40,  DCCNative,    DCMPlain},
-    {MFDES_CREATE_LINEAR_RECORD_FILE, DACd40,  DCCNative,    DCMPlain},
-    {MFDES_CREATE_CYCLIC_RECORD_FILE, DACd40,  DCCNative,    DCMPlain},
-    {MFDES_GET_VALUE,                 DACd40,  DCCNative,    DCMPlain},
-    {MFDES_CREDIT,                    DACd40,  DCCNative,    DCMPlain},
-    {MFDES_LIMITED_CREDIT,            DACd40,  DCCNative,    DCMPlain},
-    {MFDES_DEBIT,                     DACd40,  DCCNative,    DCMPlain},
-    {MFDES_COMMIT_TRANSACTION,        DACd40,  DCCNative,    DCMPlain},
-    {MFDES_CLEAR_RECORD_FILE,         DACd40,  DCCNative,    DCMPlain},
-    {MFDES_GET_FILE_SETTINGS,         DACd40,  DCCNative,    DCMPlain},
-
+    
+    {MFDES_CREATE_APPLICATION,        DACd40,  DCCNative,    DCMMACed},
+    {MFDES_DELETE_APPLICATION,        DACd40,  DCCNative,    DCMMACed},
+    {MFDES_GET_APPLICATION_IDS,       DACd40,  DCCNative,    DCMMACed},
+    {MFDES_GET_DF_NAMES,              DACd40,  DCCNative,    DCMMACed},
+    {MFDES_GET_KEY_SETTINGS,          DACd40,  DCCNative,    DCMMACed},
+    {MFDES_GET_KEY_VERSION,           DACd40,  DCCNative,    DCMMACed},
+    {MFDES_GET_FREE_MEMORY,           DACd40,  DCCNative,    DCMMACed},
+    {MFDES_CREATE_STD_DATA_FILE,      DACd40,  DCCNative,    DCMMACed},
+    {MFDES_CREATE_BACKUP_DATA_FILE,   DACd40,  DCCNative,    DCMMACed},
+    {MFDES_CREATE_VALUE_FILE,         DACd40,  DCCNative,    DCMMACed},
+    {MFDES_CREATE_LINEAR_RECORD_FILE, DACd40,  DCCNative,    DCMMACed},
+    {MFDES_CREATE_CYCLIC_RECORD_FILE, DACd40,  DCCNative,    DCMMACed},
+    {MFDES_COMMIT_TRANSACTION,        DACd40,  DCCNative,    DCMMACed},
+    {MFDES_CLEAR_RECORD_FILE,         DACd40,  DCCNative,    DCMMACed},
+    {MFDES_GET_FILE_SETTINGS,         DACd40,  DCCNative,    DCMMACed},
     {MFDES_GET_VALUE,                 DACd40,  DCCNative,    DCMMACed},
     {MFDES_CREDIT,                    DACd40,  DCCNative,    DCMMACed},
     {MFDES_DEBIT,                     DACd40,  DCCNative,    DCMMACed},
@@ -85,10 +81,10 @@ static const AllowedChannelModesS AllowedChannelModes[] = {
     {MFDES_CHANGE_KEY,                DACd40,  DCCNative,    DCMEncryptedPlain},
     {MFDES_CHANGE_KEY_EV2,            DACd40,  DCCNative,    DCMEncryptedPlain},
 
-    {MFDES_GET_KEY_VERSION,           DACEV1,  DCCNative,    DCMPlain},
-    {MFDES_GET_FREE_MEMORY,           DACEV1,  DCCNative,    DCMPlain},
     {MFDES_SELECT_APPLICATION,        DACEV1,  DCCNative,    DCMPlain},
 
+    {MFDES_GET_KEY_VERSION,           DACEV1,  DCCNative,    DCMMACed},
+    {MFDES_GET_FREE_MEMORY,           DACEV1,  DCCNative,    DCMMACed},
     {MFDES_CREATE_APPLICATION,        DACEV1,  DCCNative,    DCMMACed},
     {MFDES_DELETE_APPLICATION,        DACEV1,  DCCNative,    DCMMACed},
     {MFDES_GET_APPLICATION_IDS,       DACEV1,  DCCNative,    DCMMACed},