diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/SettingsScreen.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/SettingsScreen.kt
index 4593d2aa..556621e7 100644
--- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/SettingsScreen.kt
+++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/SettingsScreen.kt
@@ -545,9 +545,10 @@ fun SettingsScreen(
 					ConfigurationToggle(
 						stringResource(R.string.always_on_vpn_support),
 						enabled = !(
-							uiState.settings.isTunnelOnWifiEnabled ||
-								uiState.settings.isTunnelOnWifiEnabled ||
-								uiState.settings.isTunnelOnMobileDataEnabled
+							(uiState.settings.isTunnelOnWifiEnabled ||
+								uiState.settings.isTunnelOnEthernetEnabled ||
+								uiState.settings.isTunnelOnMobileDataEnabled) &&
+							uiState.settings.isAutoTunnelEnabled
 							),
 						checked = uiState.settings.isAlwaysOnVpnEnabled,
 						padding = screenPadding,