diff --git a/taxcalc/parameters.py b/taxcalc/parameters.py
index b0408a164..fec5aa0b6 100644
--- a/taxcalc/parameters.py
+++ b/taxcalc/parameters.py
@@ -424,6 +424,7 @@ def adjust_with_indexing(self, params_or_path, **kwargs):
         # Re-instate ops.
         self.label_to_extend = label_to_extend
         self.array_first = array_first
+        self.set_state()
 
         # Filter out "-indexed" params.
         nonindexed_params = {
@@ -432,10 +433,6 @@ def adjust_with_indexing(self, params_or_path, **kwargs):
             if param not in index_affected
         }
 
-        needs_reset = set(needs_reset) - set(nonindexed_params.keys())
-        if needs_reset:
-            self._set_state(params=needs_reset)
-
         # 3. Do adjustment for all non-indexing related parameters.
         adj = super().adjust(nonindexed_params, **kwargs)