diff --git a/core/modules/search/src/Plugin/migrate/destination/EntitySearchPage.php b/core/modules/search/src/Plugin/migrate/destination/EntitySearchPage.php
index 2e63dbf..99d9ef2 100644
--- a/core/modules/search/src/Plugin/migrate/destination/EntitySearchPage.php
+++ b/core/modules/search/src/Plugin/migrate/destination/EntitySearchPage.php
@@ -25,14 +25,7 @@ class EntitySearchPage extends EntityConfigBase {
   protected $moduleHandler;
 
   /**
-   * The search page.
-   *
-   * @var \Drupal\search\Entity\SearchPage
-   */
-  protected $searchPage;
-
-  /**
-   * Construct a new entity.
+   * Constructs a new EntitySearchPage.
    *
    * @param array $configuration
    *   A configuration array containing information about the plugin instance.
diff --git a/core/modules/search/src/Plugin/migrate/source/d7/SearchPage.php b/core/modules/search/src/Plugin/migrate/source/d7/SearchPage.php
index 56f5fee..fe8010f 100644
--- a/core/modules/search/src/Plugin/migrate/source/d7/SearchPage.php
+++ b/core/modules/search/src/Plugin/migrate/source/d7/SearchPage.php
@@ -34,13 +34,15 @@ protected function initializeIterator() {
   protected function values() {
     $rankings = array_map('unserialize', $this->prepareQuery()->execute()->fetchAllKeyed());
     $search_active_modules = $this->variableGet('search_active_modules', '');
-    foreach ($search_active_modules as $module => $status) {
-      if (($module === 'user') || ($module === 'node')) {
+    $values = [];
+    foreach (['node', 'user'] as $module) {
+      if (isset($search_active_modules[$module])) {
         // Create an ID field so we can record migration in the map table.
         $tmp = [
           'module' => $module,
-          'status' => $status,
+          'status' => $search_active_modules[$module],
         ];
+        // Add the node_rank_* variables (only relevant to the node module).
         if ($module === 'node') {
           $tmp = array_merge($tmp, $rankings);
         }