diff --git a/client/proxmark3.c b/client/proxmark3.c
index 17534558..98b28c3c 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -64,9 +64,9 @@ static void *main_loop(void *targ)
   while(1) {
     cmd = readline(PROXPROMPT);
     if (cmd) {
+      while(cmd[strlen(cmd) - 1] == ' ')
+        cmd[strlen(cmd) - 1] = 0x00;
       if (cmd[0] != 0x00) {
-        while(cmd[strlen(cmd) - 1] == ' ')
-          cmd[strlen(cmd) - 1]= 0x00;
         CommandReceived(cmd);
         add_history(cmd);
       }