4 files changed, 21 insertions, 5 deletions
diff --git a/src/particle/particle.cpp b/src/particle/particle.cpp
index 0705c1ed1..94d5acd17 100644
--- a/src/particle/particle.cpp
+++ b/src/particle/particle.cpp
@@ -66,6 +66,7 @@ Particle::Particle() :
     mImage(nullptr),
     mChildEmitters(),
     mChildParticles(),
+    mChildMoveParticles(),
     mDeathEffect(),
     mGravity(0.0F),
     mBounce(0.0F),
@@ -213,6 +214,8 @@ void Particle::updateSelf() restrict2
                 Particle *const p = *it;
                 p->moveBy(mPos);
                 mChildParticles.push_back(p);
+                if (p->mFollow)
+                    mChildMoveParticles.push_back(p);
             }
         }
     }
@@ -305,15 +308,20 @@ bool Particle::update() restrict2
         return true;
     }
 
-    // Update child particles
-    for (ParticleIterator p = mChildParticles.begin(),
-         fp2 = mChildParticles.end(); p != fp2; )
+    for (ParticleIterator p = mChildMoveParticles.begin(),
+         fp2 = mChildMoveParticles.end(); p != fp2; )
     {
         Particle *restrict const particle = *p;
         // move particle with its parent if desired
         if (particle->mFollow)
             particle->moveBy(change);
+    }
 
+    // Update child particles
+    for (ParticleIterator p = mChildParticles.begin(),
+         fp2 = mChildParticles.end(); p != fp2; )
+    {
+        Particle *restrict const particle = *p;
         // update particle
         if (particle->update())
         {
@@ -321,6 +329,7 @@ bool Particle::update() restrict2
         }
         else
         {
+            mChildMoveParticles.remove(*p);
             delete particle;
             p = mChildParticles.erase(p);
         }
@@ -338,7 +347,7 @@ bool Particle::update() restrict2
 void Particle::moveBy(const Vector &restrict change) restrict2
 {
     mPos += change;
-    FOR_EACH (ParticleConstIterator, p, mChildParticles)
+    FOR_EACH (ParticleConstIterator, p, mChildMoveParticles)
     {
         Particle *restrict const particle = *p;
         if (particle->mFollow)
@@ -523,4 +532,6 @@ void Particle::clear() restrict2
 
     delete_all(mChildParticles);
     mChildParticles.clear();
+
+    mChildMoveParticles.clear();
 }
diff --git a/src/particle/particle.h b/src/particle/particle.h
index dfe6ac4d1..c0e149c97 100644
--- a/src/particle/particle.h
+++ b/src/particle/particle.h
@@ -279,6 +279,8 @@ class Particle notfinal : public Actor
         // List of particles controlled by this particle
         Particles mChildParticles;
 
+        Particles mChildMoveParticles;
+
         // Particle effect file to be spawned when the particle dies
         std::string mDeathEffect;
 
diff --git a/src/particle/particleengine.cpp b/src/particle/particleengine.cpp
index cb43f5059..648d3b62d 100644
--- a/src/particle/particleengine.cpp
+++ b/src/particle/particleengine.cpp
@@ -57,6 +57,7 @@ const float ParticleEngine::PARTICLE_SKY = 800.0F;
 
 ParticleEngine::ParticleEngine() :
     mChildParticles(),
+    mChildMoveParticles(),
     mMap(nullptr)
 {
     ParticleEngine::particleCount++;
@@ -112,6 +113,7 @@ bool ParticleEngine::update() restrict2
         }
         else
         {
+            mChildMoveParticles.remove(*p);
             delete particle;
             p = mChildParticles.erase(p);
         }
@@ -331,4 +333,5 @@ void ParticleEngine::clear() restrict2
 {
     delete_all(mChildParticles);
     mChildParticles.clear();
+    mChildMoveParticles.clear();
 }
diff --git a/src/particle/particleengine.h b/src/particle/particleengine.h
index 93688f777..fef12ba64 100644
--- a/src/particle/particleengine.h
+++ b/src/particle/particleengine.h
@@ -118,7 +118,7 @@ class ParticleEngine final
     private:
         // List of particles controlled by this particle
         Particles mChildParticles;
-
+        Particles mChildMoveParticles;
         Map *mMap;
 };