diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/HomeCatalogSettingsRepository.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/HomeCatalogSettingsRepository.kt
index 20e31963..ee49f681 100644
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/HomeCatalogSettingsRepository.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/HomeCatalogSettingsRepository.kt
@@ -346,10 +346,12 @@ object HomeCatalogSettingsRepository {
         HomeRepository.applyCurrentSettings()
     }
 
-    private fun selectedHeroSourceCount(excludingKey: String? = null): Int =
-        preferences.count { (itemKey, preference) ->
-            itemKey != excludingKey && preference.heroSourceEnabled
+    private fun selectedHeroSourceCount(excludingKey: String? = null): Int {
+        val catalogKeys = definitions.mapTo(mutableSetOf()) { it.key }
+        return preferences.count { (itemKey, preference) ->
+            itemKey != excludingKey && itemKey in catalogKeys && preference.heroSourceEnabled
         }
+    }
 
     private fun move(
         key: String,
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index aa57b2d5..5026f75c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.11.2"
+agp = "8.13.2"
 android-compileSdk = "36"
 android-minSdk = "24"
 android-targetSdk = "36"