diff --git a/app/build.gradle b/app/build.gradle
index 872d66d05..437bcdef7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
 		//TODO: update as soon as sources becomes available
 		//noinspection OldTargetApi
 		targetSdkVersion 33
-		versionCode 564
-		versionName '5.3.7'
+		versionCode 565
+		versionName '5.3.8'
 		generatedDensities = []
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/UserDataSettingsFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/UserDataSettingsFragment.kt
index 4db1df275..0a8ddd561 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/UserDataSettingsFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/UserDataSettingsFragment.kt
@@ -62,12 +62,20 @@ class UserDataSettingsFragment : BasePreferenceFragment(R.string.data_and_privac
 		findPreference<Preference>(AppSettings.KEY_HTTP_CACHE_CLEAR)?.bindBytesSizeSummary(viewModel.httpCacheSize)
 		findPreference<Preference>(AppSettings.KEY_SEARCH_HISTORY_CLEAR)?.let { pref ->
 			viewModel.searchHistoryCount.observe(viewLifecycleOwner) {
-				pref.summary = pref.context.resources.getQuantityString(R.plurals.items, it, it)
+				pref.summary = if (it < 0) {
+					view.context.getString(R.string.loading_)
+				} else {
+					pref.context.resources.getQuantityString(R.plurals.items, it, it)
+				}
 			}
 		}
 		findPreference<Preference>(AppSettings.KEY_UPDATES_FEED_CLEAR)?.let { pref ->
 			viewModel.feedItemsCount.observe(viewLifecycleOwner) {
-				pref.summary = pref.context.resources.getQuantityString(R.plurals.items, it, it)
+				pref.summary = if (it < 0) {
+					view.context.getString(R.string.loading_)
+				} else {
+					pref.context.resources.getQuantityString(R.plurals.items, it, it)
+				}
 			}
 		}
 		viewModel.loadingKeys.observe(viewLifecycleOwner) { keys ->
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/utils/MultiSummaryProvider.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/utils/MultiSummaryProvider.kt
index 039dbbb37..c7ce17e55 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/utils/MultiSummaryProvider.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/utils/MultiSummaryProvider.kt
@@ -13,8 +13,9 @@ class MultiSummaryProvider(@StringRes private val emptySummaryId: Int) :
 			return preference.context.getString(emptySummaryId)
 		} else {
 			values.joinToString(", ") {
-				preference.entries[preference.findIndexOfValue(it)]
+				preference.entries.getOrNull(preference.findIndexOfValue(it))
+					?: preference.context.getString(androidx.preference.R.string.not_set)
 			}
 		}
 	}
-}
\ No newline at end of file
+}