diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/preferences/AppSettings.kt b/src/main/kotlin/com/jetpackduba/gitnuro/preferences/AppSettings.kt
index b2d61d3..3f3f848 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/preferences/AppSettings.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/preferences/AppSettings.kt
@@ -42,8 +42,8 @@ class AppSettings @Inject constructor() {
     private val _themeState = MutableStateFlow(theme)
     val themeState: StateFlow<Theme> = _themeState
 
-    private val _commitsLimitEnabledFlow = MutableSharedFlow<Boolean>()
-    val commitsLimitEnabledFlow: SharedFlow<Boolean> = _commitsLimitEnabledFlow
+    private val _commitsLimitEnabledFlow = MutableStateFlow(commitsLimitEnabled)
+    val commitsLimitEnabledFlow: MutableStateFlow<Boolean> = _commitsLimitEnabledFlow
 
     private val _ffMergeFlow = MutableStateFlow(ffMerge)
     val ffMergeFlow: StateFlow<Boolean> = _ffMergeFlow
@@ -93,7 +93,7 @@ class AppSettings @Inject constructor() {
         }
         set(value) {
             preferences.putBoolean(PREF_COMMITS_LIMIT_ENABLED, value)
-            _commitsLimitEnabledFlow.tryEmit(value)
+            _commitsLimitEnabledFlow.value = value
         }
 
     var scaleUi: Float
diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/settings/SettingsDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/settings/SettingsDialog.kt
index 493d6c1..121fc7c 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/settings/SettingsDialog.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/settings/SettingsDialog.kt
@@ -113,7 +113,7 @@ fun SettingsDialog(
 
 @Composable
 fun GitSettings(settingsViewModel: SettingsViewModel) {
-    val commitsLimitEnabled by settingsViewModel.commitsLimitEnabledFlow.collectAsState(settingsViewModel.commitsLimitEnabled)
+    val commitsLimitEnabled by settingsViewModel.commitsLimitEnabledFlow.collectAsState()
     val ffMerge by settingsViewModel.ffMergeFlow.collectAsState()
     var commitsLimit by remember { mutableStateOf(settingsViewModel.commitsLimit) }
 
diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/LogViewModel.kt b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/LogViewModel.kt
index f210276..200a72c 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/LogViewModel.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/LogViewModel.kt
@@ -100,7 +100,7 @@ class LogViewModel @Inject constructor(
 
     init {
         tabScope.launch {
-            appSettings.commitsLimitEnabledFlow.collect {
+            appSettings.commitsLimitEnabledFlow.drop(1).collect {
                 tabState.refreshData(RefreshType.ONLY_LOG)
             }
         }