diff -u b/core/modules/migrate/src/Plugin/migrate/destination/Config.php b/core/modules/migrate/src/Plugin/migrate/destination/Config.php
--- b/core/modules/migrate/src/Plugin/migrate/destination/Config.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/Config.php
@@ -157,14 +157,7 @@
     // The migrate modules are not valid destination modules.
-    if (in_array($destination_module, ['migrate', 'migrate_drupal', 'migrate_drupal_ui'])) {
-      $configuration_destination = (!empty($this->configuration['config_name'])) ? $this->configuration['config_name'] : NULL;
-      if ($configuration_destination) {
-        $destination_module = explode('.', $configuration_destination, 2)[0];
-      }
-      else {
-        $destination_module = NULL;
-      }
+    if (in_array($destination_module, ['migrate', 'migrate_drupal', 'migrate_drupal_ui'], TRUE)) {
+      $destination_module = (!empty($this->configuration['config_name'])) ? explode('.', $this->configuration['config_name'], 2)[0] : NULL;
     }
     return $destination_module;
   }
-
 }
diff -u b/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php b/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php
--- b/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php
@@ -115,11 +115,7 @@
    * {@inheritdoc}
    */
   public function getProvider() {
-    $destination_module = (!empty($this->configuration['provider'])) ? $this->configuration['provider'] : NULL;
-    if (!$destination_module) {
-      $destination_module = $this->pluginDefinition['provider'];
-    }
-    return $destination_module;
+    return (!empty($this->configuration['provider'])) ? $this->configuration['provider'] : $this->pluginDefinition['provider'];
   }
 
 }
diff -u b/core/modules/migrate/src/Plugin/migrate/destination/EntityViewMode.php b/core/modules/migrate/src/Plugin/migrate/destination/EntityViewMode.php
--- b/core/modules/migrate/src/Plugin/migrate/destination/EntityViewMode.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/EntityViewMode.php
@@ -6,8 +6,7 @@
  * Provides entity view mode destination plugin.
  *
  * @MigrateDestination(
- *   id = "entity:entity_view_mode",
- *   provider = "core"
+ *   id = "entity:entity_view_mode"
  * )
  */
 class EntityViewMode extends EntityConfigBase {
@@ -26,7 +25,8 @@
  * "targetEntityType") to an "entity_view_mode" entity.
  *
  * @MigrateDestination(
- *   id = "entity:entity_view_mode"
+ *   id = "entity:entity_view_mode",
+ *   provider = "core"
  * )
  */
 class EntityViewMode extends EntityConfigBase {
diff -u b/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php b/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php
--- b/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php
+++ b/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php
@@ -546,11 +546,13 @@
    * {@inheritdoc}
    */
   public function getProvider() {
-    $source_module = (!empty($this->configuration['provider'])) ? $this->configuration['provider'] : NULL;
-    if (!$source_module) {
-      $source_module = (!empty($this->pluginDefinition['source_provider'])) ? $this->pluginDefinition['source_provider'] : NULL;
+    if (!empty($this->configuration['provider'])) {
+      return $this->configuration['provider'];
     }
-    return $source_module;
+    elseif (!empty($this->pluginDefinition['source_provider'])) {
+      return $this->pluginDefinition['source_provider'];
+    }
+    return NULL;
   }
 
 }
diff -u b/core/modules/migrate/tests/src/Kernel/Plugin/ProvidersExistTest.php b/core/modules/migrate/tests/src/Kernel/Plugin/ProvidersExistTest.php
--- b/core/modules/migrate/tests/src/Kernel/Plugin/ProvidersExistTest.php
+++ b/core/modules/migrate/tests/src/Kernel/Plugin/ProvidersExistTest.php
@@ -6,6 +6,7 @@
 use Drupal\KernelTests\FileSystemModuleDiscoveryDataProviderTrait;
 use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
 use Drupal\migrate\Plugin\MigrationProviderInterface;
+
 /**
  * Tests that providers exist for all source and destination plugins.
  *
diff -u b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
--- b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
+++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
@@ -433,11 +433,8 @@
       ksort($table_data[$source_module]);
     }
 
-    $system_data = [];
     // Fetch the system data at the first opportunity.
-    if (empty($system_data)) {
-      $system_data = $form_state->get('system_data');
-    }
+    $system_data = $form_state->get('system_data');
     $unmigrated_source_modules = array_diff_key($system_data['module'], $table_data);
 
     // Missing migrations.