diff --git a/ui/src/routes/devices.$id.settings.access._index.tsx b/ui/src/routes/devices.$id.settings.access._index.tsx
index f21927a8d..e0543b859 100644
--- a/ui/src/routes/devices.$id.settings.access._index.tsx
+++ b/ui/src/routes/devices.$id.settings.access._index.tsx
@@ -409,7 +409,7 @@ export default function SettingsAccessIndexRoute() {
                       .
                     </div>
                   </div>
-                  <hr className="block w-full dark:border-slate-600" />
+                  <hr className="block w-full border-slate-800/20 dark:border-slate-300/20" />
 
                   <div>
                     <LinkButton
@@ -469,4 +469,4 @@ export default function SettingsAccessIndexRoute() {
   );
 }
 
-SettingsAccessIndexRoute.loader = loader;
\ No newline at end of file
+SettingsAccessIndexRoute.loader = loader;
diff --git a/ui/src/routes/devices.$id.settings.network.tsx b/ui/src/routes/devices.$id.settings.network.tsx
index 167cf0b25..16804b506 100644
--- a/ui/src/routes/devices.$id.settings.network.tsx
+++ b/ui/src/routes/devices.$id.settings.network.tsx
@@ -356,7 +356,7 @@ export default function SettingsNetworkRoute() {
             />
           </SettingsItem>
           <AutoHeight>
-            {!networkSettingsLoaded ? (
+            {!networkSettingsLoaded && !networkState?.dhcp_lease ? (
               <GridCard>
                 <div className="p-4">
                   <div className="space-y-4">
@@ -402,7 +402,8 @@ export default function SettingsNetworkRoute() {
             />
           </SettingsItem>
           <AutoHeight>
-            {!networkSettingsLoaded ? (
+            {!networkSettingsLoaded &&
+            !(networkState?.ipv6_addresses && networkState.ipv6_addresses.length > 0) ? (
               <GridCard>
                 <div className="p-4">
                   <div className="space-y-4">