diff --git a/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c b/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c
index 9c5436d337..6a9b389ca5 100644
--- a/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c
+++ b/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c
@@ -2827,7 +2827,8 @@ DevPathFromTextWiFi (
   )
 {
   CHAR16                *SSIdStr;
-  CHAR8                 *AsciiStr;
+  CHAR8                 AsciiStr[33];
+  UINTN                 DataLen;
   WIFI_DEVICE_PATH      *WiFiDp;
 
   SSIdStr = GetNextParamStr (&TextDeviceNode);
@@ -2837,8 +2838,16 @@ DevPathFromTextWiFi (
                                    (UINT16) sizeof (WIFI_DEVICE_PATH)
                                    );
 
-  AsciiStr = (CHAR8 *) WiFiDp->SSId;
-  StrToAscii (SSIdStr, &AsciiStr);
+  if (NULL != SSIdStr) {
+    DataLen = StrLen (SSIdStr);
+    if (StrLen (SSIdStr) > 32) {
+      SSIdStr[32] = L'\0';
+      DataLen     = 32;
+    }
+
+    UnicodeStrToAsciiStr (SSIdStr, AsciiStr);
+    CopyMem (WiFiDp->SSId, AsciiStr, DataLen);
+  }
 
   return (EFI_DEVICE_PATH_PROTOCOL *) WiFiDp;
 }
diff --git a/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c b/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c
index 0774fd8c17..363830bd32 100644
--- a/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c
+++ b/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c
@@ -1616,9 +1616,14 @@ DevPathToTextWiFi (
   )
 {
   WIFI_DEVICE_PATH      *WiFi;
+  UINT8                 SSId[33];
 
   WiFi = DevPath;
-  UefiDevicePathLibCatPrint (Str, L"Wi-Fi(%a)", WiFi->SSId);
+
+  SSId[32] = '\0';
+  CopyMem (SSId, WiFi->SSId, 32);
+
+  UefiDevicePathLibCatPrint (Str, L"Wi-Fi(%a)", SSId);
 }
 
 /**