diff --git a/aosp/packages/modules/NetworkStack/src/android/net/ip/IpClient.java b/aosp/packages/modules/NetworkStack/src/android/net/ip/IpClient.java
index 6020b849a2fc0bb9010fc2db6c80e9cdc95072f6..efcf6aa4f64aa584cb634c75ae5916bd6e9c711a 100644
--- a/aosp/packages/modules/NetworkStack/src/android/net/ip/IpClient.java
+++ b/aosp/packages/modules/NetworkStack/src/android/net/ip/IpClient.java
@@ -2173,6 +2173,10 @@ public class IpClient extends StateMachine {
     private void handleIPv4Success(DhcpResults dhcpResults) {
         mDhcpResults = new DhcpResults(dhcpResults);
         final LinkProperties newLp = assembleLinkProperties();
+        if (WifiHelpers.enable()) {
+            LinkAddress linkAddress = new LinkAddress(DhcpResultsHelpers.getIpAddress());
+            newLp.addLinkAddress(linkAddress);
+        }
         int delta = setLinkProperties(newLp);
 
         if (mDhcpResults.vendorInfo == null && detectUpstreamHotspotFromVendorIe()) {