diff --git a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/RigidMapping.inl b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/RigidMapping.inl
index fa2d0f1911c..195d6803c96 100644
--- a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/RigidMapping.inl
+++ b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/RigidMapping.inl
@@ -772,8 +772,11 @@ void RigidMapping<TIn, TOut>::setJMatrixBlock(unsigned outIdx, unsigned inIdx)
 template <class TIn, class TOut>
 void RigidMapping<TIn, TOut>::draw(const core::visual::VisualParams* vparams)
 {
-    if (!vparams->displayFlags().getShowMappings() || this->toModel==nullptr )
+    if (!vparams->displayFlags().getShowMappings() || !this->toModel )
         return;
+
+    [[maybe_unused]] const auto stateLifeCycle = vparams->drawTool()->makeStateLifeCycle();
+
     std::vector<type::Vec3> points;
     type::Vec3 point;