diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c
index ae643996aa..46460aeca9 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.c
@@ -335,9 +335,11 @@ ShellLevel2StripQuotes (
     return EFI_OUT_OF_RESOURCES;
   }
 
-  for (Walker = *CleanString; Walker != NULL && *Walker != CHAR_NULL; Walker++) {
+  for (Walker = *CleanString; Walker != NULL && *Walker != CHAR_NULL;) {
     if (*Walker == L'\"') {
       CopyMem (Walker, Walker+1, StrSize (Walker) - sizeof (Walker[0]));
+    } else {
+      Walker++;
     }
   }