diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php
index cf82591..b6e57d8 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php
@@ -384,7 +384,7 @@ public function buildForm(array $form, array &$form_state, VocabularyInterface $
         '#type' => 'submit',
         '#value' => t('Reset to alphabetical')
       );
-      $form_state['redirect'] = array(current_path(), ($this->request->query->get('page') ? array('query' => array('page' => $this->request->query->get('page'))) : array()));
+      $form_state['redirect'] = array(current_path(), ($page ? array('query' => array('page' => $page)) : array()));
     }
 
     return $form;