diff --git a/EmbeddedPkg/Ebl/HwDebug.c b/EmbeddedPkg/Ebl/HwDebug.c
index 20f0a72d95..dcf7c4a7a1 100644
--- a/EmbeddedPkg/Ebl/HwDebug.c
+++ b/EmbeddedPkg/Ebl/HwDebug.c
@@ -114,9 +114,9 @@ EblMfillCmd (
     if (Width == 4) {
       MmioWrite32 (Address, Data);
     } else if (Width == 2) {
-      MmioWrite32 (Address, (UINT16)Data);
+      MmioWrite16 (Address, (UINT16)Data);
     } else {
-      MmioWrite32 (Address, (UINT8)Data);
+      MmioWrite8 (Address, (UINT8)Data);
     }
   }