diff --git a/scripts/pi-hole/js/settings-system.js b/scripts/pi-hole/js/settings-system.js
index 5bbe4e1a..be0698b2 100644
--- a/scripts/pi-hole/js/settings-system.js
+++ b/scripts/pi-hole/js/settings-system.js
@@ -362,4 +362,23 @@ $(function () {
       },
     },
   });
+
+  $.ajax({
+    url: "/api/network/gateway",
+  })
+    .done(function (data) {
+      const gateway = data.gateway;
+      // Get first object in gateway that has family == "inet"
+      const inet = gateway.find(obj => obj.family === "inet");
+      // Get first object in gateway that has family == "inet6"
+      const inet6 = gateway.find(obj => obj.family === "inet6");
+
+      $("#sysinfo-gw-v4-addr").text(inet ? inet.local.join('\n') : "N/A");
+      $("#sysinfo-gw-v4-iface").text(inet ? inet.interface : "N/A");
+      $("#sysinfo-gw-v6-addr").text(inet6 ? inet6.local.join('\n') : "N/A");
+      $("#sysinfo-gw-v6-iface").text(inet6 ? inet6.interface : "N/A");
+    })
+    .fail(function (data) {
+      apiFailure(data);
+    });
 });
diff --git a/settings-system.lp b/settings-system.lp
index 0b88ce8b..aa480b8e 100644
--- a/settings-system.lp
+++ b/settings-system.lp
@@ -54,6 +54,18 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
                                 </tr>
                             </tbody>
                         </table>
+                        <table class="table table-striped table-bordered nowrap">
+                            <tbody>
+                                <tr>
+                                    <th scope="row">IPv4 address:</th>
+                                    <td><code id="sysinfo-gw-v4-addr">?</code>&nbsp;@&nbsp;<code id="sysinfo-gw-v4-iface">?</code></td>
+                                </tr>
+                                <tr>
+                                    <th scope="row">IPv6 address:</th>
+                                    <td><code id="sysinfo-gw-v6-addr">?</code>&nbsp;@&nbsp;<code id="sysinfo-gw-v6-iface">?</code></td>
+                                </tr>
+                            </tbody>
+                        </table>
                     </div>
                 </div>
             </div>