diff --git a/src/Mod/Fem/femcommands/commands.py b/src/Mod/Fem/femcommands/commands.py
index 721dc1defe..d35c82970c 100644
--- a/src/Mod/Fem/femcommands/commands.py
+++ b/src/Mod/Fem/femcommands/commands.py
@@ -696,8 +696,6 @@ class _MaterialMechanicalNonlinear(CommandManager):
         # set some property of the solver to nonlinear
         # (only if one solver is available and if this solver is a CalculiX solver):
         # nonlinear material
-        # nonlinear geometry --> it is triggered anyway
-        # https://forum.freecad.org/viewtopic.php?f=18&t=23101&p=180489#p180489
         solver_object = None
         for m in self.active_analysis.Group:
             if m.isDerivedFrom("Fem::FemSolverObjectPython"):
@@ -715,11 +713,10 @@ class _MaterialMechanicalNonlinear(CommandManager):
             or is_of_type(solver_object, "Fem::SolverCalculix")
         ):
             FreeCAD.Console.PrintMessage(
-                "Set MaterialNonlinearity and GeometricalNonlinearity to nonlinear for {}\n"
+                "Set MaterialNonlinearity to nonlinear for {}\n"
                 .format(solver_object.Label)
             )
             solver_object.MaterialNonlinearity = "nonlinear"
-            solver_object.GeometricalNonlinearity = "nonlinear"
         FreeCAD.ActiveDocument.commitTransaction()
         FreeCADGui.Selection.clearSelection()
         FreeCAD.ActiveDocument.recompute()
diff --git a/src/Mod/Fem/femtools/checksanalysis.py b/src/Mod/Fem/femtools/checksanalysis.py
index 311e0594f1..f41244a5df 100644
--- a/src/Mod/Fem/femtools/checksanalysis.py
+++ b/src/Mod/Fem/femtools/checksanalysis.py
@@ -61,14 +61,6 @@ def check_member_for_solver_calculix(analysis, solver, mesh, member):
                 "Solver is set to nonlinear materials, "
                 "but there is no nonlinear material in the analysis.\n"
             )
-        if solver.Proxy.Type == "Fem::SolverCcxTools" \
-                and solver.GeometricalNonlinearity != "nonlinear":
-            # nonlinear geometry --> should be set
-            # https://forum.freecad.org/viewtopic.php?f=18&t=23101&p=180489#p180489
-            message += (
-                "Solver CalculiX triggers nonlinear geometry for nonlinear material, "
-                "thus it should to be set too.\n"
-            )
 
     # mesh
     if not mesh: