diff --git a/src/libslic3r/Fill/FillGyroid.cpp b/src/libslic3r/Fill/FillGyroid.cpp
index 1e1e35b9e7..651abffd9c 100644
--- a/src/libslic3r/Fill/FillGyroid.cpp
+++ b/src/libslic3r/Fill/FillGyroid.cpp
@@ -106,9 +106,9 @@ static Polylines make_gyroid_waves(double gridZ, double density_adjusted, double
 {
     const double scaleFactor = scale_(line_spacing) / density_adjusted;
 
-    // tolerance (in scaled units)
-    // TODO: should consider layer thickness
-    const double tolerance = line_spacing / 2 / unscale<double>(scaleFactor);
+    // tolerance (in scaled units) - note: clamp the maximum tolerance
+    // as there's no benefit to reduce the definition with large nozzles
+    const double tolerance = std::min(line_spacing, 0.4) / 2 / unscale<double>(scaleFactor);
 
  //scale factor for 5% : 8 712 388
  // 1z = 10^-6 mm ?