diff --git a/packages/network_info_plus/network_info_plus/android/src/main/kotlin/dev/fluttercommunity/plus/network_info/NetworkInfo.kt b/packages/network_info_plus/network_info_plus/android/src/main/kotlin/dev/fluttercommunity/plus/network_info/NetworkInfo.kt
index 61318091ba..722663f141 100644
--- a/packages/network_info_plus/network_info_plus/android/src/main/kotlin/dev/fluttercommunity/plus/network_info/NetworkInfo.kt
+++ b/packages/network_info_plus/network_info_plus/android/src/main/kotlin/dev/fluttercommunity/plus/network_info/NetworkInfo.kt
@@ -25,7 +25,7 @@ internal class NetworkInfo(
     fun getWifiIPAddress(): String? {
         var ipAddress: String? = null
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             val linkAddresses =
                 connectivityManager?.getLinkProperties(connectivityManager.activeNetwork)?.linkAddresses
 
@@ -80,12 +80,12 @@ internal class NetworkInfo(
     }
 
     fun getGatewayIPAddress(): String? {
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            val linkAddresses =
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            val linkProperties =
                 connectivityManager?.getLinkProperties(connectivityManager.activeNetwork)
-            val dhcpServer = linkAddresses?.dhcpServerAddress?.hostAddress
+            val defaultRoute = linkProperties?.routes?.firstOrNull { route -> route.isDefaultRoute }
 
-            dhcpServer
+            defaultRoute?.gateway?.hostAddress
         } else {
             @Suppress("DEPRECATION")
             val dhcpInfo = wifiManager.dhcpInfo
diff --git a/packages/network_info_plus/network_info_plus/android/src/main/kotlin/dev/fluttercommunity/plus/network_info/NetworkInfoPlusPlugin.kt b/packages/network_info_plus/network_info_plus/android/src/main/kotlin/dev/fluttercommunity/plus/network_info/NetworkInfoPlusPlugin.kt
index a1f7b06bc2..fc6e6baf53 100644
--- a/packages/network_info_plus/network_info_plus/android/src/main/kotlin/dev/fluttercommunity/plus/network_info/NetworkInfoPlusPlugin.kt
+++ b/packages/network_info_plus/network_info_plus/android/src/main/kotlin/dev/fluttercommunity/plus/network_info/NetworkInfoPlusPlugin.kt
@@ -28,7 +28,7 @@ class NetworkInfoPlusPlugin : FlutterPlugin {
             context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
 
         var connectivityManager: ConnectivityManager? = null
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             connectivityManager = context.applicationContext.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
         }