diff --git a/NetworkPkg/Ip6Dxe/Ip6Driver.c b/NetworkPkg/Ip6Dxe/Ip6Driver.c
index d242b153df..3fd1f73195 100644
--- a/NetworkPkg/Ip6Dxe/Ip6Driver.c
+++ b/NetworkPkg/Ip6Dxe/Ip6Driver.c
@@ -472,6 +472,18 @@ Ip6CreateService (
                 );
   }
 
+  //
+  // If there is any gateway address, set it.
+  //
+  DataItem = &IpSb->Ip6ConfigInstance.DataItem[Ip6ConfigDataTypeGateway];
+  if (DataItem->Data.Ptr != NULL) {
+    DataItem->SetData (
+                &IpSb->Ip6ConfigInstance,
+                DataItem->DataSize,
+                DataItem->Data.Ptr
+                );
+  }
+
   InsertHeadList (&IpSb->Interfaces, &IpSb->DefaultInterface->Link);
 
   *Service = IpSb;