diff --git a/src/particle.cpp b/src/particle.cpp
index 46df63cd13a..2977d359819 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -296,6 +296,10 @@ void Particle::event_advance()
   if (distance == distance_cutoff) {
     wgt() = 0.0;
   }
+
+  // Clear surface component if distance is long enough
+  if (distance > TINY_BIT)
+    surface() = SURFACE_NONE;
 }
 
 void Particle::event_cross_surface()
@@ -374,6 +378,8 @@ void Particle::event_collide()
   if (!model::active_meshsurf_tallies.empty())
     score_meshsurface_tally(*this, model::active_meshsurf_tallies);
 
+  auto last_surface = std::abs(surface());
+
   // Clear surface component
   surface() = SURFACE_NONE;
 
@@ -383,6 +389,13 @@ void Particle::event_collide()
     collision_mg(*this);
   }
 
+  if (last_surface != SURFACE_NONE) {
+    const auto& surf {*model::surfaces[last_surface - 1].get()};
+    Direction normal = surf.normal(r());
+    if (normal.dot(u()) * normal.dot(u_last()) < 0.0)
+      neighbor_list_find_cell(*this);
+  }
+
   // Collision track feature to recording particle interaction
   if (settings::collision_track) {
     collision_track_record(*this);
diff --git a/tests/unit_tests/test_geometry.py b/tests/unit_tests/test_geometry.py
index 6cc577c820c..9269f157e3b 100644
--- a/tests/unit_tests/test_geometry.py
+++ b/tests/unit_tests/test_geometry.py
@@ -403,3 +403,30 @@ def test_redundant_surfaces():
     geom = openmc.Geometry([c3])
     redundant_surfs = geom.remove_redundant_surfaces()
     assert len(redundant_surfs) == 0
+
+    
+def test_sphere_overlap(run_in_tmpdir):
+    model = openmc.model.Model()
+    shell_material = openmc.Material()
+    shell_material.add_element("Au", 1.0, percent_type="ao")    
+    shell_material.set_density("g/cm3", 1930) 
+    # revolver density    
+    model.materials = openmc.Materials([shell_material])    
+    surface_inner_shell = openmc.Sphere(r=0.0035)    
+    surface_outer_shell = openmc.Sphere(r=0.0095)    
+    sphere_surface_detector_1 = openmc.Sphere(r=20000, boundary_type="vacuum")    
+    fuel_region = -surface_inner_shell    
+    shell_region = +surface_inner_shell & -surface_outer_shell    
+    void_region_1 = +surface_outer_shell & -sphere_surface_detector_1    
+    fuel_cell = openmc.Cell(region=fuel_region)    
+    shell_cell = openmc.Cell(region=shell_region, fill=shell_material)    
+    void_cell_1 = openmc.Cell(region=void_region_1)        
+    model.geometry = openmc.Geometry([fuel_cell, shell_cell, void_cell_1])    
+    source = openmc.Source()    
+    source.angle = openmc.stats.Isotropic()    
+    model.settings = openmc.Settings()    
+    model.settings.batches = 100    
+    model.settings.particles = 80000    
+    model.settings.run_mode = "fixed source"    
+    model.settings.source = source    
+    model.run(geometry_debug=True)