diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c b/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
index b46c7047ee..52b6e21652 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
@@ -1545,10 +1545,10 @@ ArpFindCacheEntry (
 
   if (EntryLength != NULL) {
     //
-    // Return the entry length.
+    // Return the entry length, make sure its 8 bytes alignment.
     //
-    *EntryLength = sizeof (EFI_ARP_FIND_DATA) + Instance->ConfigData.SwAddressLength +
-                   ArpService->SnpMode.HwAddressSize;
+    *EntryLength = (((sizeof (EFI_ARP_FIND_DATA) + Instance->ConfigData.SwAddressLength +
+                   ArpService->SnpMode.HwAddressSize) + 3) & ~(0x3));
   }
 
   if (EntryCount != NULL) {