diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
index 809a3f9707..246b4f47b1 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
@@ -3670,8 +3670,6 @@ GetNameElement (
       HasValue = TRUE;
     } else if ((NextTag = StrStr (StringPtr, L"&")) != NULL) {
       *NextTag = L'\0';
-    } else {
-      goto Done;
     }
 
     //