diff --git a/include/openmc/particle_data.h b/include/openmc/particle_data.h
index 24b7eb53c0a..1436b791f62 100644
--- a/include/openmc/particle_data.h
+++ b/include/openmc/particle_data.h
@@ -298,6 +298,7 @@ class GeometryState {
       cell = C_NONE;
     }
     n_coord_last_ = 1;
+    cell_instance_last_ = 0;
   }
 
   //! moves the particle by the specified distance to its next location
@@ -343,12 +344,32 @@ class GeometryState {
   LocalCoord& lowest_coord() { return coord_[n_coord_ - 1]; }
   const LocalCoord& lowest_coord() const { return coord_[n_coord_ - 1]; }
 
-  // Last coordinates on all nesting levels, before crossing a surface
+  //! Cells occupied at each nesting level before the last cell change.
+  //
+  //! These record where the particle came from, not where it is. They are
+  //! written when the particle enters a new cell -- at birth, and on each
+  //! surface or lattice crossing -- and are deliberately NOT updated on
+  //! collision, so that they stay meaningful for a particle that collides
+  //! repeatedly without leaving the cell it is in. This is what lets
+  //! CellFromFilter decompose a volumetric score by the cell the scoring
+  //! particle arrived from. At birth they are set to the particle's own cells,
+  //! so a particle that has not yet crossed anything counts as coming from
+  //! where it started.
   int& n_coord_last() { return n_coord_last_; }
   const int& n_coord_last() const { return n_coord_last_; }
   int& cell_last(int i) { return cell_last_[i]; }
   const int& cell_last(int i) const { return cell_last_[i]; }
 
+  //! Distribcell instance the particle occupied in cell_last() at the lowest
+  //! coordinate level.
+  //
+  //! Maintained alongside cell_last() and on the same cadence. Needed because
+  //! a cell with distributed materials or temperatures resolves those per
+  //! instance, so the cell index alone does not determine which material the
+  //! particle came from.
+  int& cell_instance_last() { return cell_instance_last_; }
+  int cell_instance_last() const { return cell_instance_last_; }
+
   // Coordinates at birth
   Position& r_born() { return r_born_; }
   const Position& r_born() const { return r_born_; }
@@ -403,8 +424,8 @@ class GeometryState {
   // material of current and last cell
   int& material() { return material_; }
   const int& material() const { return material_; }
-  int& material_last() { return material_last_; }
-  const int& material_last() const { return material_last_; }
+  int& material_xs_cache() { return material_xs_cache_; }
+  int material_xs_cache() const { return material_xs_cache_; }
 
   // temperature of current and last cell
   double& sqrtkT() { return sqrtkT_; }
@@ -423,8 +444,9 @@ class GeometryState {
   int cell_instance_;        //!< offset for distributed properties
   vector<LocalCoord> coord_; //!< coordinates for all levels
 
-  int n_coord_last_ {1};  //!< number of current coordinates
-  vector<int> cell_last_; //!< coordinates for all levels
+  int n_coord_last_ {1};       //!< number of current coordinates
+  vector<int> cell_last_;      //!< coordinates for all levels
+  int cell_instance_last_ {0}; //!< distribcell instance in cell_last_
 
   Position r_born_;         //!< coordinates at birth
   Position r_last_current_; //!< coordinates of the last collision or
@@ -438,8 +460,8 @@ class GeometryState {
 
   BoundaryInfo boundary_; //!< Info about the next intersection
 
-  int material_ {-1};      //!< index for current material
-  int material_last_ {-1}; //!< index for last material
+  int material_ {-1};          //!< index for current material
+  int material_xs_cache_ {-1}; //!< material the xs cache is valid for
 
   double sqrtkT_ {-1.0};     //!< sqrt(k_Boltzmann * temperature) in eV
   double sqrtkT_last_ {0.0}; //!< last temperature
diff --git a/src/geometry.cpp b/src/geometry.cpp
index 687be57fee9..565210dab87 100644
--- a/src/geometry.cpp
+++ b/src/geometry.cpp
@@ -198,7 +198,7 @@ bool find_cell_inner(
       }
 
       // Set the material, temperature and density multiplier.
-      p.material_last() = p.material();
+      p.material_xs_cache() = p.material();
       p.material() = c.material(p.cell_instance());
       p.sqrtkT_last() = p.sqrtkT();
       p.sqrtkT() = c.sqrtkT(p.cell_instance());
diff --git a/src/particle.cpp b/src/particle.cpp
index f7a0098acf9..187294cdc0f 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -236,6 +236,7 @@ void Particle::event_calculate_xs()
       cell_last(j) = coord(j).cell();
     }
     n_coord_last() = n_coord();
+    cell_instance_last() = cell_instance();
   }
 
   // Write particle track.
@@ -248,7 +249,7 @@ void Particle::event_calculate_xs()
   // Calculate microscopic and macroscopic cross sections
   if (material() != MATERIAL_VOID) {
     if (settings::run_CE) {
-      if (material() != material_last() || sqrtkT() != sqrtkT_last() ||
+      if (material() != material_xs_cache() || sqrtkT() != sqrtkT_last() ||
           density_mult() != density_mult_last()) {
         // If the material is the same as the last material and the
         // temperature hasn't changed, we don't need to lookup cross
@@ -339,6 +340,7 @@ void Particle::event_cross_surface()
     cell_last(j) = coord(j).cell();
   }
   n_coord_last() = n_coord();
+  cell_instance_last() = cell_instance();
 
   // Set surface that particle is on and adjust coordinate levels
   surface() = boundary().surface();
@@ -461,9 +463,9 @@ void Particle::event_collide()
   // Save coordinates for tallying purposes
   r_last_current() = r();
 
-  // Set last material to none since cross sections will need to be
-  // re-evaluated
-  material_last() = C_NONE;
+  // Invalidate the cross section cache, since the particle's energy has
+  // changed and cross sections must be re-evaluated.
+  material_xs_cache() = C_NONE;
 
   // Set all directions to base level -- right now, after a collision, only
   // the base level directions are changed
@@ -686,7 +688,7 @@ void Particle::cross_surface(const Surface& surf)
                        lowest_coord().universe()) -
                      1;
     // save material, temperature, and density multiplier
-    material_last() = material();
+    material_xs_cache() = material();
     sqrtkT_last() = sqrtkT();
     density_mult_last() = density_mult();
     // set new cell value
diff --git a/src/tallies/filter_materialfrom.cpp b/src/tallies/filter_materialfrom.cpp
index 91f03aef85e..8bb5aa872bc 100644
--- a/src/tallies/filter_materialfrom.cpp
+++ b/src/tallies/filter_materialfrom.cpp
@@ -1,6 +1,7 @@
 #include "openmc/tallies/filter_materialfrom.h"
 
 #include "openmc/cell.h"
+#include "openmc/constants.h"
 #include "openmc/material.h"
 
 namespace openmc {
@@ -8,7 +9,13 @@ namespace openmc {
 void MaterialFromFilter::get_all_bins(
   const Particle& p, TallyEstimator estimator, FilterMatch& match) const
 {
-  auto search = map_.find(p.material_last());
+  int32_t i_cell = p.cell_last(p.n_coord_last() - 1);
+  if (i_cell == C_NONE)
+    return;
+
+  int32_t i_material = model::cells[i_cell]->material(p.cell_instance_last());
+
+  auto search = map_.find(i_material);
   if (search != map_.end()) {
     match.bins_.push_back(search->second);
     match.weights_.push_back(1.0);
diff --git a/tests/unit_tests/test_filter_material_from.py b/tests/unit_tests/test_filter_material_from.py
new file mode 100644
index 00000000000..6bb6d643573
--- /dev/null
+++ b/tests/unit_tests/test_filter_material_from.py
@@ -0,0 +1,220 @@
+"""MaterialFromFilter must decompose scores the same way CellFromFilter does.
+
+The geometry below gives each cell its own material, so the two decompositions
+are one-to-one and must agree bin for bin. Both must also sum to the
+undecomposed total. These are per-history identities within a single run, not
+statistical statements, so they hold to round-off.
+
+Note the volumetric tests below score `total`, not `flux`. Scoring `flux` here
+would silently turn them into surface tallies measuring a different quantity.
+"""
+
+import numpy as np
+import openmc
+import pytest
+
+
+@pytest.fixture
+def model():
+    openmc.reset_auto_ids()
+    model = openmc.Model()
+
+    water = openmc.Material(name='water')
+    water.set_density('g/cm3', 1.0)
+    water.add_nuclide('H1', 2.0)
+    water.add_nuclide('O16', 1.0)
+
+    iron = openmc.Material(name='iron')
+    iron.set_density('g/cm3', 7.87)
+    iron.add_nuclide('Fe56', 1.0)
+
+    inner_surf = openmc.Sphere(r=5.0)
+    outer_surf = openmc.Sphere(r=15.0, boundary_type='vacuum')
+    inner = openmc.Cell(name='inner', fill=water, region=-inner_surf)
+    outer = openmc.Cell(name='outer', fill=iron,
+                        region=+inner_surf & -outer_surf)
+    model.geometry = openmc.Geometry([inner, outer])
+
+    model.settings.run_mode = 'fixed source'
+    model.settings.batches = 10
+    model.settings.particles = 2000
+    # Source at the centre, so every particle scoring in the outer cell got
+    # there by crossing the surface out of the inner cell. The shell is thick
+    # enough in mean free paths that most of them scatter there repeatedly,
+    # which is what exercises the post-collision reset.
+    model.settings.source = openmc.IndependentSource(
+        space=openmc.stats.Point((0.0, 0.0, 0.0)),
+        energy=openmc.stats.delta_function(2.0e6),
+    )
+
+    in_outer = openmc.CellFilter([outer])
+
+    total = openmc.Tally(name='total')
+    total.filters = [in_outer]
+    total.scores = ['total']
+
+    by_cell = openmc.Tally(name='by cell')
+    by_cell.filters = [in_outer, openmc.CellFromFilter([inner, outer])]
+    by_cell.scores = ['total']
+
+    by_material = openmc.Tally(name='by material')
+    by_material.filters = [in_outer, openmc.MaterialFromFilter([water, iron])]
+    by_material.scores = ['total']
+
+    model.tallies = openmc.Tallies([total, by_cell, by_material])
+    return model
+
+
+def test_material_from_matches_cell_from(model, run_in_tmpdir):
+    with openmc.StatePoint(model.run()) as sp:
+        total = sp.get_tally(name='total').mean.ravel()
+        by_cell = sp.get_tally(name='by cell').mean.ravel()
+        by_material = sp.get_tally(name='by material').mean.ravel()
+
+    # Neither decomposition may lose scores. Before the fix the material
+    # decomposition fell short of the total by everything scored after a
+    # particle's first collision in the cell.
+    assert by_cell.sum() == pytest.approx(total.sum(), rel=1e-9)
+    assert by_material.sum() == pytest.approx(total.sum(), rel=1e-9)
+
+    # One material per cell, so the two decompositions are the same partition
+    np.testing.assert_allclose(by_material, by_cell, rtol=1e-9)
+
+
+def test_from_bin_survives_repeated_collisions(model, run_in_tmpdir):
+    """The 'from inner' bin holds all of the outer cell's reaction rate.
+
+    A particle that has crossed from the inner cell keeps `cell_last` 
+    pointing at that cell for as long as it stays in the outer one,
+    however many times it collides. The 'from outer' bin can only be
+    populated by a particle that leaves the outer cell and comes back, which
+    this geometry does not allow since the outer boundary is vacuum and the
+    inner cell is convex. So the 'from inner' bin should carry the whole total.
+    """
+    with openmc.StatePoint(model.run()) as sp:
+        total = sp.get_tally(name='total').mean.ravel()
+        by_material = sp.get_tally(name='by material').mean.ravel()
+
+    from_water, from_iron = by_material
+    assert from_water == pytest.approx(total.sum(), rel=1e-9)
+    assert from_iron == pytest.approx(0.0, abs=1e-12)
+
+
+@pytest.fixture
+def distribcell_model():
+    """A 2x2 lattice of one repeated cell carrying four distributed materials.
+
+    Every instance has the same composition, so the four "from" bins are
+    physically equivalent and should come out equal within statistics. The
+    point is that they are non-zero at all: the material fill is resolved per
+    instance, so deriving the previous material from cell_last() alone would
+    attribute every score to the first material.
+    """
+    openmc.reset_auto_ids()
+    model = openmc.Model()
+
+    def fuel():
+        m = openmc.Material()
+        m.set_density('g/cm3', 10.0)
+        m.add_nuclide('U238', 1.0)
+        m.add_nuclide('O16', 2.0)
+        return m
+
+    fuels = [fuel() for _ in range(4)]
+
+    reflector = openmc.Material(name='reflector')
+    reflector.set_density('g/cm3', 1.0)
+    reflector.add_nuclide('H1', 2.0)
+    reflector.add_nuclide('O16', 1.0)
+
+    # One cell, filled with a list of materials, repeated at every lattice
+    # position, so it has four distribcell instances
+    pin = openmc.Cell(name='pin', fill=fuels)
+    pin_universe = openmc.Universe(cells=[pin])
+
+    lattice = openmc.RectLattice()
+    lattice.lower_left = (-2.0, -2.0)
+    lattice.pitch = (2.0, 2.0)
+    lattice.universes = [[pin_universe, pin_universe],
+                         [pin_universe, pin_universe]]
+
+    box = openmc.model.RectangularPrism(4.0, 4.0)
+    sphere = openmc.Sphere(r=20.0, boundary_type='vacuum')
+    lattice_cell = openmc.Cell(name='lattice', fill=lattice,
+                               region=-box & -sphere)
+    outside = openmc.Cell(name='outside', fill=reflector,
+                          region=+box & -sphere)
+    model.geometry = openmc.Geometry([lattice_cell, outside])
+
+    model.settings.run_mode = 'fixed source'
+    model.settings.batches = 10
+    model.settings.particles = 4000
+    # Born throughout the lattice, so all four instances are populated
+    model.settings.source = openmc.IndependentSource(
+        space=openmc.stats.Box((-2.0, -2.0, -1.0), (2.0, 2.0, 1.0)),
+        energy=openmc.stats.delta_function(2.0e6),
+    )
+
+    in_outside = openmc.CellFilter([outside])
+
+    total = openmc.Tally(name='total')
+    total.filters = [in_outside]
+    total.scores = ['total']
+
+    by_material = openmc.Tally(name='by material')
+    by_material.filters = [in_outside, openmc.MaterialFromFilter(fuels)]
+    by_material.scores = ['total']
+
+    model.tallies = openmc.Tallies([total, by_material])
+    return model
+
+
+def test_distributed_materials_resolve_per_instance(distribcell_model,
+                                                    run_in_tmpdir):
+    with openmc.StatePoint(distribcell_model.run()) as sp:
+        total = sp.get_tally(name='total').mean.ravel().sum()
+        by_material = sp.get_tally(name='by material').mean.ravel()
+
+    # Everything scoring in the reflector arrived from some lattice instance,
+    # so no score may go unattributed
+    assert by_material.sum() == pytest.approx(total, rel=1e-9)
+
+    # All four instances contribute. Resolving the fill without the instance
+    # would put the whole total in the first bin and leave the rest at zero.
+    assert (by_material > 0.0).all()
+
+    # The instances are geometrically and compositionally equivalent, so the
+    # four bins should be comparable; the bound is loose enough to be
+    # insensitive to counting statistics
+    assert by_material.max() < 1.5 * by_material.min()
+
+
+def test_partial_current_decompositions_agree(model, run_in_tmpdir):
+    """The surface-tally use of these filters is unaffected.
+
+    A `flux` score with a "from" filter is a cell-to-cell partial current, not a
+    volumetric flux: it is scored in event_cross_surface() right after the
+    crossing.
+    """
+    inner, outer = model.geometry.get_all_cells().values()
+    water = inner.fill
+    in_outer = openmc.CellFilter([outer])
+
+    from_cell = openmc.Tally(name='current from cell')
+    from_cell.filters = [in_outer, openmc.CellFromFilter([inner])]
+    from_cell.scores = ['flux']
+
+    from_mat = openmc.Tally(name='current from material')
+    from_mat.filters = [in_outer, openmc.MaterialFromFilter([water])]
+    from_mat.scores = ['flux']
+
+    model.tallies = openmc.Tallies([from_cell, from_mat])
+
+    with openmc.StatePoint(model.run()) as sp:
+        by_cell = sp.get_tally(name='current from cell').mean.ravel()
+        by_material = sp.get_tally(name='current from material').mean.ravel()
+
+    # Every particle from a point source at the centre crosses into the outer
+    # cell, so this is not a vacuous comparison of two zeros
+    assert by_cell.sum() > 0.0
+    np.testing.assert_allclose(by_material, by_cell, rtol=1e-9)