diff --git a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
index 4ae77eb..6cce573 100644
--- a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
+++ b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
@@ -323,7 +323,6 @@ public function buildForm(array $form, FormStateInterface $form_state) {
         '#title' => $this->t('Feed row style'),
         '#type' => 'select',
         '#options' => $feed_row_options,
-        '#default_value' => key($feed_row_options),
         '#access' => (count($feed_row_options) > 1),
         '#states' => array(
           'visible' => array(
@@ -334,6 +333,9 @@ public function buildForm(array $form, FormStateInterface $form_state) {
         '#suffix' => '</div>',
       );
     }
+    // Dynamically determine the feed row style as it varies by base table.
+    $feed_style_form = &$form['displays']['page']['options']['feed_properties'];
+    $feed_style_form['row_plugin']['#default_value'] = static::getSelected($form_state, array('page', 'feed_properties', 'row_plugin'), key($feed_row_options), $feed_style_form['row_plugin']);
 
     // Only offer the block settings if the module is enabled.
     if (\Drupal::moduleHandler()->moduleExists('block')) {