diff --git a/SPlisHSPlasH/TimeStep.cpp b/SPlisHSPlasH/TimeStep.cpp
index e331417c..9ec06e56 100644
--- a/SPlisHSPlasH/TimeStep.cpp
+++ b/SPlisHSPlasH/TimeStep.cpp
@@ -41,11 +41,15 @@ void TimeStep::clearAccelerations(const unsigned int fluidModelIndex)
 	for (unsigned int i=0; i < count; i++)
 	{
 		// Clear accelerations of dynamic particles
-		if (model->getMass(i) != 0.0)
+		Vector3r& a = model->getAcceleration(i);
+		if (model->getMass(i) != 0.0 && model->getParticleState(i) == ParticleState::Active)
 		{
-			Vector3r &a = model->getAcceleration(i);
 			a = grav;
 		}
+		else
+		{
+			a.setZero();
+		}
 	}
 }