diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
index 504caab3b..77b171336 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
@@ -79,8 +79,6 @@ object PreferenceKeys {
 
     const val enabledLanguages = "source_languages"
 
-    const val sourcesSort = "sources_sort"
-
     const val backupDirectory = "backup_directory"
 
     const val downloadsDirectory = "download_directory"
@@ -266,4 +264,6 @@ object PreferenceKeys {
     const val sources_tab_categories = "sources_tab_categories"
 
     const val sources_tab_source_categories = "sources_tab_source_categories"
+
+    const val sourcesSort = "sources_sort"
 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
index 847c2f033..5471e2cc9 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
@@ -145,8 +145,6 @@ class PreferencesHelper(val context: Context) {
 
     fun enabledLanguages() = flowPrefs.getStringSet(Keys.enabledLanguages, setOf("all", "en", Locale.getDefault().language))
 
-    fun sourceSorting() = flowPrefs.getInt(Keys.sourcesSort, 0)
-
     fun trackUsername(sync: TrackService) = prefs.getString(Keys.trackUsername(sync.id), "")
 
     fun trackPassword(sync: TrackService) = prefs.getString(Keys.trackPassword(sync.id), "")
@@ -366,4 +364,6 @@ class PreferencesHelper(val context: Context) {
     fun sourcesTabCategories() = flowPrefs.getStringSet(Keys.sources_tab_categories, mutableSetOf())
 
     fun sourcesTabSourcesInCategories() = flowPrefs.getStringSet(Keys.sources_tab_source_categories, mutableSetOf())
+
+    fun sourceSorting() = flowPrefs.getInt(Keys.sourcesSort, 0)
 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterController.kt
index 8d8b16932..e6caace5a 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterController.kt
@@ -117,7 +117,7 @@ class SourceFilterController : SettingsController() {
 
             onChange { newValue ->
                 val checked = newValue as Boolean
-                val current = preferences.disabledSources().get() as MutableSet? ?: mutableSetOf()
+                val current = preferences.disabledSources().get().toMutableSet()
                 if (checked) {
                     current.removeAll(sources.map { it.id.toString() })
                 } else {