1 files changed, 6 insertions, 4 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt
index 1b0db33b14..cb495a3ba6 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt
@@ -242,10 +242,12 @@ fun SharedTransitionScope.VpnSettings(
         state = state,
         initialScrollToFeature = navArgs.scrollToFeature,
         modifier =
-            Modifier.sharedBounds(
-                rememberSharedContentState(key = navArgs.scrollToFeature ?: ""),
-                animatedVisibilityScope = animatedVisibilityScope,
-            ),
+            if (navArgs.scrollToFeature != null) {
+                Modifier.sharedBounds(
+                    rememberSharedContentState(key = navArgs.scrollToFeature),
+                    animatedVisibilityScope = animatedVisibilityScope,
+                )
+            } else Modifier,
         snackbarHostState = snackbarHostState,
         navigateToContentBlockersInfo =
             dropUnlessResumed { navigator.navigate(ContentBlockersInfoDestination) },