diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_default/Tid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_default/Tid.php
index 6aaad0f..19a7691 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_default/Tid.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_default/Tid.php
@@ -72,7 +72,7 @@ public function buildOptionsForm(&$form, &$form_state) {
       '#type' => 'checkboxes',
       '#title' => t('Vocabularies'),
       '#options' => $options,
-      '#default_value' => $this->options['vocabularies'],
+      '#default_value' => $this->options['vids'],
       '#states' => array(
         'visible' => array(
           ':input[name="options[argument_default][taxonomy_tid][limit]"]' => array('checked' => TRUE),
@@ -99,7 +99,7 @@ public function buildOptionsForm(&$form, &$form_state) {
 
   public function submitOptionsForm(&$form, &$form_state, &$options = array()) {
     // Filter unselected items so we don't unnecessarily store giant arrays.
-    $options['vids'] = array_filter($options['vocabularies']);
+    $options['vids'] = array_filter($options['vids']);
   }
 
   function get_argument() {
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php
index c06d91b..74a3ef4 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php
@@ -28,8 +28,8 @@ class TaxonomyIndexTid extends ManyToOne {
 
   public function init(ViewExecutable $view, &$options) {
     parent::init($view, $options);
-    if (!empty($this->definition['vid'])) {
-      $this->options['vid'] = $this->definition['vid'];
+    if (!empty($this->definition['vocabulary'])) {
+      $this->options['vid'] = $this->definition['vocabulary'];
     }
   }
 
@@ -63,7 +63,7 @@ public function buildExtraOptionsForm(&$form, &$form_state) {
         $this->options['vid'] = $first_vocabulary->id();
       }
 
-      if (empty($this->definition['vid'])) {
+      if (empty($this->definition['vocabulary'])) {
         $form['vid'] = array(
           '#type' => 'radios',
           '#title' => t('Vocabulary'),