--- a/ui/material2/src/commonMain/kotlin/com/geekorum/aboutoss/ui/material/OpenSourceDependenciesListScreen.kt	Wed May 07 14:35:10 2025 -0400
+++ b/ui/material2/src/commonMain/kotlin/com/geekorum/aboutoss/ui/material/OpenSourceDependenciesListScreen.kt	Wed May 07 14:35:58 2025 -0400
@@ -41,13 +41,13 @@
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.geekorum.aboutoss.common.generated.resources.title_oss_licenses
 import com.geekorum.aboutoss.ui.common.OpenSourceLicensesViewModel
 import org.jetbrains.compose.resources.stringResource
@@ -66,7 +66,7 @@
     onDependencyClick: (String) -> Unit,
     onUpClick: () -> Unit
 ) {
-    val dependencies by viewModel.dependenciesList.collectAsState(initial = emptyList())
+    val dependencies by viewModel.dependenciesList.collectAsStateWithLifecycle(initialValue = emptyList())
     OpenSourceDependenciesListScreen(
         dependencies = dependencies,
         onDependencyClick = onDependencyClick,
--- a/ui/material2/src/commonMain/kotlin/com/geekorum/aboutoss/ui/material/OpenSourceLicenseScreen.kt	Wed May 07 14:35:10 2025 -0400
+++ b/ui/material2/src/commonMain/kotlin/com/geekorum/aboutoss/ui/material/OpenSourceLicenseScreen.kt	Wed May 07 14:35:58 2025 -0400
@@ -38,7 +38,6 @@
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
@@ -54,6 +53,7 @@
 import androidx.compose.ui.text.withLink
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.geekorum.aboutoss.ui.common.BrowserLauncher
 import com.geekorum.aboutoss.ui.common.OpenSourceLicensesViewModel
 import com.geekorum.aboutoss.ui.common.rememberBrowserLauncher
@@ -72,7 +72,7 @@
     onUpClick: () -> Unit,
     browserLauncher: BrowserLauncher = rememberBrowserLauncher()
 ) {
-    val license by viewModel.getLicenseDependency(dependency).collectAsState("")
+    val license by viewModel.getLicenseDependency(dependency).collectAsStateWithLifecycle("")
     OpenSourceLicenseScreen(
         dependency = dependency,
         license = license,