diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php b/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php
index 00d680a..63fd448 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php
@@ -67,7 +67,7 @@ public function form(array $form, array &$form_state, EntityInterface $term) {
     // items so we check for taxonomy_override_selector before loading the
     // full vocabulary. Contrib modules can then intercept before
     // hook_form_alter to provide scalable alternatives.
-    if (!state()->get('taxonomy_override_selector') ?: FALSE) {
+    if (!config('taxonomy')->get('override_selector')) {
       $parent = array_keys(taxonomy_term_load_parents($term->tid));
       $children = taxonomy_get_tree($vocabulary->vid, $term->tid);
 
diff --git a/core/modules/taxonomy/taxonomy.admin.inc b/core/modules/taxonomy/taxonomy.admin.inc
index 99d7fd3..d4fd172 100644
--- a/core/modules/taxonomy/taxonomy.admin.inc
+++ b/core/modules/taxonomy/taxonomy.admin.inc
@@ -151,7 +151,8 @@ function taxonomy_overview_terms($form, &$form_state, Vocabulary $vocabulary) {
   $form['#parent_fields'] = FALSE;
 
   $page            = isset($_GET['page']) ? $_GET['page'] : 0;
-  $page_increment  = state()->get('taxonomy_terms_per_page_admin') ?: 100;  // Number of terms per page.
+  // Number of terms per page.
+  $page_increment  = config('taxonomy')->get('terms_per_page_admin') ?: 100;
   $page_entries    = 0;   // Elements shown on this page.
   $before_entries  = 0;   // Elements at the root level before this page.
   $after_entries   = 0;   // Elements at the root level after this page.
diff --git a/core/modules/taxonomy/taxonomy.install b/core/modules/taxonomy/taxonomy.install
index 6ec24a1..efe43ee 100644
--- a/core/modules/taxonomy/taxonomy.install
+++ b/core/modules/taxonomy/taxonomy.install
@@ -10,8 +10,8 @@
  */
 function taxonomy_uninstall() {
   // Remove variables.
-  state()->delete('taxonomy_override_selector');
-  state()->delete('taxonomy_terms_per_page_admin');
+  config()->delete('taxonomy_override_selector');
+  config()->delete('taxonomy_terms_per_page_admin');
   // Remove taxonomy_term bundles.
   $vocabularies = db_query("SELECT machine_name FROM {taxonomy_vocabulary}")->fetchCol();
   foreach ($vocabularies as $vocabulary) {