diff --git a/ChangeLog.md b/ChangeLog.md
index c559d14b2..b1da8d24c 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -215,6 +215,7 @@ Nazara Development Kit:
 - Added experimental BoxLayout class
 - RenderSystem now resolve skinning before render
 - EntityOwner constructor taking a Entity* is no longer explicit
+- PhysicsComponent2D now allows massless bodies (zero mass)
 
 # 0.4:
 
diff --git a/SDK/include/NDK/Components/PhysicsComponent2D.inl b/SDK/include/NDK/Components/PhysicsComponent2D.inl
index bd550c41b..b60ac5047 100644
--- a/SDK/include/NDK/Components/PhysicsComponent2D.inl
+++ b/SDK/include/NDK/Components/PhysicsComponent2D.inl
@@ -320,7 +320,7 @@ namespace Ndk
 	inline void PhysicsComponent2D::SetMass(float mass)
 	{
 		NazaraAssert(m_object, "Invalid physics object");
-		NazaraAssert(mass > 0.f, "Mass should be positive");
+		NazaraAssert(mass >= 0.f, "Mass should be positive");
 
 		m_object->SetMass(mass);
 	}