diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Bundle.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Bundle.kt
index 5c6258ea4..8933ae4db 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Bundle.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Bundle.kt
@@ -24,11 +24,15 @@ inline fun <reified T : Parcelable> Intent.getParcelableExtraCompat(key: String)
 }
 
 inline fun <reified T : Serializable> Intent.getSerializableExtraCompat(key: String): T? {
-	return getSerializableExtra(key) as T?
+	return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+		getSerializableExtra(key, T::class.java)
+	} else {
+		getSerializableExtra(key) as T?
+	}
 }
 
 inline fun <reified T : Serializable> Bundle.getSerializableCompat(key: String): T? {
-	return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+	return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
 		getSerializable(key, T::class.java)
 	} else {
 		getSerializable(key) as T?
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/edit/FavouritesCategoryEditActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/edit/FavouritesCategoryEditActivity.kt
index f22bad095..6704aaaf5 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/edit/FavouritesCategoryEditActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/edit/FavouritesCategoryEditActivity.kt
@@ -68,10 +68,7 @@ class FavouritesCategoryEditActivity :
 
 	override fun onRestoreInstanceState(savedInstanceState: Bundle) {
 		super.onRestoreInstanceState(savedInstanceState)
-		val order = savedInstanceState.getSerializableCompat<ListSortOrder>(KEY_SORT_ORDER)
-		if (order != null) {
-			selectedSortOrder = order
-		}
+		selectedSortOrder = savedInstanceState.getSerializableCompat(KEY_SORT_ORDER)
 	}
 
 	override fun onClick(v: View) {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/SettingsActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/SettingsActivity.kt
index 82ba17efa..0d85d8b05 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/SettingsActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/SettingsActivity.kt
@@ -157,7 +157,7 @@ class SettingsActivity :
 			ACTION_SOURCES -> SourcesSettingsFragment()
 			ACTION_MANAGE_DOWNLOADS -> DownloadsSettingsFragment()
 			ACTION_SOURCE -> SourceSettingsFragment.newInstance(
-				intent.getSerializableExtraCompat(EXTRA_SOURCE) as? MangaSource ?: MangaSource.LOCAL,
+				intent.getSerializableExtraCompat(EXTRA_SOURCE) ?: MangaSource.LOCAL,
 			)
 
 			ACTION_MANAGE_SOURCES -> SourcesManageFragment()
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/auth/SourceAuthActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/auth/SourceAuthActivity.kt
index 4239c03fb..7dd9ba8a2 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/auth/SourceAuthActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/auth/SourceAuthActivity.kt
@@ -46,7 +46,7 @@ class SourceAuthActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallba
 		if (!catchingWebViewUnavailability { setContentView(ActivityBrowserBinding.inflate(layoutInflater)) }) {
 			return
 		}
-		val source = intent?.getSerializableExtraCompat(EXTRA_SOURCE) as? MangaSource
+		val source = intent?.getSerializableExtraCompat<MangaSource>(EXTRA_SOURCE)
 		if (source == null) {
 			finishAfterTransition()
 			return