diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 17ad46e..a0b454f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -31,7 +31,7 @@ android {
 		generateLocaleConfig = true
 	}
 
-	//reproducibility
+	// reproducibility
 	dependenciesInfo {
 		// Disables dependency metadata when building APKs.
 		includeInApk = false
diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunneloptions/TunnelOptionsScreen.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunneloptions/TunnelOptionsScreen.kt
index 60c77f9..63684c9 100644
--- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunneloptions/TunnelOptionsScreen.kt
+++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunneloptions/TunnelOptionsScreen.kt
@@ -40,7 +40,7 @@ import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
 @Composable
 fun OptionsScreen(tunnelOptionsViewModel: TunnelOptionsViewModel = hiltViewModel(), appUiState: AppUiState, tunnelId: Int) {
 	val navController = LocalNavController.current
-	val config = remember { appUiState.tunnels.first { it.id == tunnelId } }
+	val config = appUiState.tunnels.first { it.id == tunnelId }
 
 	var currentText by remember { mutableStateOf("") }
 
diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunneloptions/splittunnel/SplitTunnelScreen.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunneloptions/splittunnel/SplitTunnelScreen.kt
index 30a610b..d7225dd 100644
--- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunneloptions/splittunnel/SplitTunnelScreen.kt
+++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunneloptions/splittunnel/SplitTunnelScreen.kt
@@ -76,7 +76,7 @@ fun SplitTunnelScreen(appUiState: AppUiState, tunnelId: Int, viewModel: AppViewM
 		if (popBackStack) navController.popBackStack()
 	}
 
-	val config by remember { derivedStateOf { appUiState.tunnels.first { it.id == tunnelId } } }
+	val config = appUiState.tunnels.first { it.id == tunnelId }
 
 	val splitTunnelApps by viewModel.splitTunnelApps.collectAsStateWithLifecycle()
 
diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunneloptions/tunnelautotunnel/TunnelAutoTunnelScreen.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunneloptions/tunnelautotunnel/TunnelAutoTunnelScreen.kt
index d25c4d9..f23c27a 100644
--- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunneloptions/tunnelautotunnel/TunnelAutoTunnelScreen.kt
+++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunneloptions/tunnelautotunnel/TunnelAutoTunnelScreen.kt
@@ -49,7 +49,7 @@ import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
 
 @Composable
 fun TunnelAutoTunnelScreen(appUiState: AppUiState, tunnelId: Int, tunnelAutoTunnelViewModel: TunnelAutoTunnelViewModel = hiltViewModel()) {
-	val config = remember { appUiState.tunnels.first { it.id == tunnelId } }
+	val config = appUiState.tunnels.first { it.id == tunnelId }
 
 	var currentText by remember { mutableStateOf("") }