diff --git a/sample/src/main/java/com/smileidentity/sample/compose/MainScreen.kt b/sample/src/main/java/com/smileidentity/sample/compose/MainScreen.kt
index 5b1d4d1e3..13cfe4c35 100644
--- a/sample/src/main/java/com/smileidentity/sample/compose/MainScreen.kt
+++ b/sample/src/main/java/com/smileidentity/sample/compose/MainScreen.kt
@@ -14,6 +14,7 @@ import androidx.compose.material3.BadgedBox
 import androidx.compose.material3.Button
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FilterChip
+import androidx.compose.material3.FilterChipDefaults.filterChipColors
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
@@ -372,6 +373,9 @@ private fun TopBar(
                 selected = uiState.isProduction,
                 onClick = viewModel::toggleEnvironment,
                 label = { Text(stringResource(id = uiState.environmentName)) },
+                colors = filterChipColors(
+                    selectedContainerColor = MaterialTheme.colorScheme.tertiary,
+                ),
             )
             if (isJobsScreenSelected) {
                 PlainTooltipBox(
diff --git a/sample/src/main/java/com/smileidentity/sample/compose/jobs/OrchestratedJobsScreen.kt b/sample/src/main/java/com/smileidentity/sample/compose/jobs/OrchestratedJobsScreen.kt
index 5b4459667..aa7c170f1 100644
--- a/sample/src/main/java/com/smileidentity/sample/compose/jobs/OrchestratedJobsScreen.kt
+++ b/sample/src/main/java/com/smileidentity/sample/compose/jobs/OrchestratedJobsScreen.kt
@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment.Companion.Center
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -22,8 +23,8 @@ fun OrchestratedJobsScreen(
         factory = viewModelFactory { JobsViewModel(isProduction) },
     ),
 ) {
-    val uiState = viewModel.uiState.collectAsStateWithLifecycle().value
-    val jobs = viewModel.jobs.collectAsStateWithLifecycle().value
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+    val jobs by viewModel.jobs.collectAsStateWithLifecycle()
     Box(
         contentAlignment = Center,
         modifier = modifier