diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderView.kt
index eb8ee11a1c..0f444350c9 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderView.kt
@@ -63,8 +63,6 @@ fun ChangeAccountProviderView(
     onOtherProviderClicked: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    val scrollState = rememberScrollState()
-
     Scaffold(
         modifier = modifier,
         topBar = {
@@ -83,9 +81,7 @@ fun ChangeAccountProviderView(
         ) {
             Column(
                 modifier = Modifier
-                    .verticalScroll(
-                        state = scrollState,
-                    )
+                    .verticalScroll(state = rememberScrollState())
             ) {
                 IconTitleSubtitleMolecule(
                     modifier = Modifier.padding(top = 16.dp, bottom = 32.dp, start = 16.dp, end = 16.dp),
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderView.kt
index 605992d930..3ee9f115d7 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderView.kt
@@ -81,8 +81,6 @@ fun SearchAccountProviderView(
     modifier: Modifier = Modifier,
 ) {
     val eventSink = state.eventSink
-    val scrollState = rememberScrollState()
-
     Scaffold(
         modifier = modifier,
         topBar = {
@@ -101,9 +99,7 @@ fun SearchAccountProviderView(
         ) {
             Column(
                 modifier = Modifier
-                    .verticalScroll(
-                        state = scrollState,
-                    )
+                    .verticalScroll(state = rememberScrollState())
             ) {
                 IconTitleSubtitleMolecule(
                     modifier = Modifier.padding(top = 16.dp, bottom = 40.dp, start = 16.dp, end = 16.dp),
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportView.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportView.kt
index 05f3232aac..0e0ebaaab2 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportView.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportView.kt
@@ -81,12 +81,9 @@ fun BugReportView(
             .systemBarsPadding()
             .imePadding()
     ) {
-        val scrollState = rememberScrollState()
         Column(
             modifier = Modifier
-                .verticalScroll(
-                    state = scrollState,
-                )
+                .verticalScroll(state = rememberScrollState())
                 .padding(horizontal = 16.dp),
         ) {
             val isError = state.sending is Async.Failure
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceScreen.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceScreen.kt
index eacdf82fb7..65cd428729 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceScreen.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceScreen.kt
@@ -68,14 +68,11 @@ fun PreferenceView(
             )
         },
         content = {
-            val scrollState = rememberScrollState()
             Column(
                 modifier = Modifier
                     .padding(it)
                     .consumeWindowInsets(it)
-                    .verticalScroll(
-                        state = scrollState,
-                    )
+                    .verticalScroll(state = rememberScrollState())
             ) {
                 content()
             }