diff --git a/client/src/cmdmain.c b/client/src/cmdmain.c
index b738fe620..35dcfc39b 100644
--- a/client/src/cmdmain.c
+++ b/client/src/cmdmain.c
@@ -283,7 +283,7 @@ static int CmdQuit(const char *Cmd) {
     };
     CLIExecWithReturn(ctx, Cmd, argtable, true);
     CLIParserFree(ctx);
-    return PM3_SQUIT;
+    return PM3_EFATAL;
 }
 
 static int CmdRev(const char *Cmd) {
diff --git a/client/src/proxmark3.c b/client/src/proxmark3.c
index 9ebf01a1e..f5da41dc7 100644
--- a/client/src/proxmark3.c
+++ b/client/src/proxmark3.c
@@ -574,11 +574,6 @@ check_script:
                 // exit or quit
                 if (mainret == PM3_EFATAL)
                     break;
-                if (mainret == PM3_SQUIT) {
-                    // Normal quit, map to 0
-                    mainret = PM3_SUCCESS;
-                    break;
-                }
             }
             free(cmd);
             cmd = NULL;
diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h
index 15caa9299..9ccbbeb5c 100644
--- a/include/pm3_cmd.h
+++ b/include/pm3_cmd.h
@@ -794,11 +794,7 @@ typedef struct {
 #define FLAG_ANSI        0x08
 
 // Error codes                          Usages:
-
-// Success, regular quit
-#define PM3_SQUIT               2
-// Success, transfer nonces            pm3:        Sending nonces back to client
-#define PM3_SNONCES             1
+// NOTE: Positive values should be reserved for commands in case they need to return multiple statuses and error codes simultaneously.
 // Success (no error)
 #define PM3_SUCCESS             0