diff --git a/src/lagrangian/basic/Cloud/Cloud.C b/src/lagrangian/basic/Cloud/Cloud.C
index 460b9650704eb369c554153fd2e78dceb823f806..d85ef08dcaf6304a0c140b58ddb6a3fc3aa07053 100644
--- a/src/lagrangian/basic/Cloud/Cloud.C
+++ b/src/lagrangian/basic/Cloud/Cloud.C
@@ -423,6 +423,10 @@ void Foam::Cloud<ParticleType>::autoMap
                 trackStartCell = 0;
                 p.cell() = 0;
             }
+            else
+            {
+                p.cell() = trackStartCell;
+            }
 
             vector pos = p.position();