diff --git a/src/Entity/Index.php b/src/Entity/Index.php
index 9c55a45..e2a98d4 100644
--- a/src/Entity/Index.php
+++ b/src/Entity/Index.php
@@ -1059,6 +1059,11 @@ class Index extends ConfigEntityBase implements IndexInterface {
     foreach ($this->getProcessorsByStage(ProcessorInterface::STAGE_PRE_INDEX_SAVE) as $processor) {
       $processor->preIndexSave();
     }
+
+    $this->field_settings = array();
+    foreach ($this->getFields() as $field_id => $field) {
+      $this->field_settings[$field_id] = $field->getSettings();
+    }
   }
 
   /**
diff --git a/tests/src/Kernel/CliTest.php b/tests/src/Kernel/CliTest.php
index c99833e..655a7a6 100644
--- a/tests/src/Kernel/CliTest.php
+++ b/tests/src/Kernel/CliTest.php
@@ -131,7 +131,7 @@ class CliTest extends KernelTestBase {
     $indexed_items = $index->getTrackerInstance()->getIndexedItemsCount();
 
     $this->assertEquals(4, $total_items, 'All 4 items are tracked.');
-    $this->assertEquals(0, $indexed_items, '0 items are indexed');
+    $this->assertEquals(2, $indexed_items, '2 items are indexed');
   }
 
 }