diff --git a/lib/page/dashboard/providers/dashboard_home_provider.dart b/lib/page/dashboard/providers/dashboard_home_provider.dart
index 480a9ce8..91f313a7 100644
--- a/lib/page/dashboard/providers/dashboard_home_provider.dart
+++ b/lib/page/dashboard/providers/dashboard_home_provider.dart
@@ -3,7 +3,6 @@ import 'package:privacy_gui/core/data/providers/dashboard_manager_provider.dart'
 import 'package:privacy_gui/core/data/providers/device_manager_provider.dart';
 import 'package:privacy_gui/page/dashboard/providers/dashboard_home_state.dart';
 import 'package:privacy_gui/page/dashboard/services/dashboard_home_service.dart';
-import 'package:privacy_gui/page/health_check/providers/health_check_provider.dart';
 
 final dashboardHomeProvider =
     NotifierProvider<DashboardHomeNotifier, DashboardHomeState>(
@@ -15,8 +14,6 @@ class DashboardHomeNotifier extends Notifier<DashboardHomeState> {
   DashboardHomeState build() {
     final dashboardManagerState = ref.watch(dashboardManagerProvider);
     final deviceManagerState = ref.watch(deviceManagerProvider);
-    // Watch healthCheckProvider to maintain reactivity (even though we don't use it directly)
-    ref.watch(healthCheckProvider);
 
     final service = ref.read(dashboardHomeServiceProvider);
     return service.buildDashboardHomeState(
diff --git a/lib/page/instant_verify/views/instant_verify_view.dart b/lib/page/instant_verify/views/instant_verify_view.dart
index 6ee959d9..3aaef7a3 100644
--- a/lib/page/instant_verify/views/instant_verify_view.dart
+++ b/lib/page/instant_verify/views/instant_verify_view.dart
@@ -18,8 +18,6 @@ import 'package:privacy_gui/page/components/shortcuts/dialogs.dart';
 import 'package:privacy_gui/page/components/ui_kit_page_view.dart';
 import 'package:privacy_gui/page/components/views/arguments_view.dart';
 import 'package:flutter/material.dart';
-import 'package:privacy_gui/page/dashboard/_dashboard.dart';
-import 'package:privacy_gui/page/dashboard/providers/dashboard_home_provider.dart';
 import 'package:privacy_gui/page/health_check/_health_check.dart';
 import 'package:privacy_gui/page/instant_verify/providers/instant_verify_provider.dart';
 import 'package:privacy_gui/page/dashboard/views/components/_components.dart';
@@ -722,7 +720,7 @@ class _InstantVerifyViewState extends ConsumerState<InstantVerifyView>
   }
 
   Widget _portsCard(BuildContext context, WidgetRef ref) {
-    final state = ref.watch(dashboardHomeProvider);
+    final state = ref.watch(dashboardManagerProvider);
     return AppCard(
         key: const ValueKey('portCard'),
         padding: EdgeInsets.zero,
@@ -739,7 +737,7 @@ class _InstantVerifyViewState extends ConsumerState<InstantVerifyView>
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-                  ...state.lanPortConnections
+                  ...state.lanConnections
                       .mapIndexed((index, e) => Expanded(
                             child: PortStatusWidget(
                               connection: e == 'None' ? null : e,
@@ -751,9 +749,9 @@ class _InstantVerifyViewState extends ConsumerState<InstantVerifyView>
                       .toList(),
                   Expanded(
                     child: PortStatusWidget(
-                      connection: state.wanPortConnection == 'None'
+                      connection: state.wanConnection == 'None'
                           ? null
-                          : state.wanPortConnection,
+                          : state.wanConnection,
                       label: loc(context).wan,
                       isWan: true,
                       hasLanPorts: true, // Force vertical layout
diff --git a/lib/page/wifi_settings/providers/wifi_bundle_provider.dart b/lib/page/wifi_settings/providers/wifi_bundle_provider.dart
index 4a3cc842..cda7eca8 100644
--- a/lib/page/wifi_settings/providers/wifi_bundle_provider.dart
+++ b/lib/page/wifi_settings/providers/wifi_bundle_provider.dart
@@ -5,7 +5,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:privacy_gui/core/jnap/actions/jnap_service_supported.dart';
 import 'package:privacy_gui/core/data/providers/dashboard_manager_provider.dart';
 import 'package:privacy_gui/core/data/providers/device_manager_provider.dart';
-import 'package:privacy_gui/page/dashboard/providers/dashboard_home_provider.dart';
 import 'package:privacy_gui/page/instant_privacy/providers/instant_privacy_state.dart';
 import 'package:privacy_gui/page/wifi_settings/providers/wifi_advanced_state.dart';
 import 'package:privacy_gui/page/wifi_settings/providers/wifi_bundle_state.dart';
@@ -35,7 +34,6 @@ class WifiBundleNotifier extends Notifier<WifiBundleState>
   WifiBundleState build() {
     final dashboardManagerState = ref.read(dashboardManagerProvider);
     final deviceManagerState = ref.read(deviceManagerProvider);
-    final homeState = ref.read(dashboardHomeProvider);
 
     // Use service layer to create initial WiFi list settings
     // This avoids importing JNAP models directly in the provider
@@ -55,7 +53,7 @@ class WifiBundleNotifier extends Notifier<WifiBundleState>
         );
 
     final initialWifiListStatus = WiFiListStatus(
-        canDisableMainWiFi: homeState.lanPortConnections.isNotEmpty);
+        canDisableMainWiFi: dashboardManagerState.lanConnections.isNotEmpty);
 
     const initialAdvancedSettings = WifiAdvancedSettingsState();
     final initialPrivacySettings = InstantPrivacySettings.init();
@@ -84,8 +82,8 @@ class WifiBundleNotifier extends Notifier<WifiBundleState>
   @override
   Future<(WifiBundleSettings?, WifiBundleStatus?)> performFetch(
       {bool forceRemote = false, bool updateStatusOnly = false}) async {
+    final dashboardManagerState = ref.read(dashboardManagerProvider);
     final deviceManagerState = ref.read(deviceManagerProvider);
-    final homeState = ref.read(dashboardHomeProvider);
     final (newSettings, newStatus) =
         await ref.read(wifiSettingsServiceProvider).fetchBundleSettings(
               serviceHelper: serviceHelper,
@@ -93,7 +91,7 @@ class WifiBundleNotifier extends Notifier<WifiBundleState>
               mainWifiDevices: deviceManagerState.mainWifiDevices,
               guestWifiDevices: deviceManagerState.guestWifiDevices,
               allDevices: deviceManagerState.deviceList,
-              isLanConnected: homeState.lanPortConnections.isNotEmpty,
+              isLanConnected: dashboardManagerState.lanConnections.isNotEmpty,
               getBandConnectedBy: (device) => ref
                   .read(deviceManagerProvider.notifier)
                   .getBandConnectedBy(device),