diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp
index 5db104f47..a9959a695 100644
--- a/src/libslic3r/Print.cpp
+++ b/src/libslic3r/Print.cpp
@@ -230,7 +230,8 @@ bool Print::invalidate_state_by_config_options(const std::vector<t_config_option
             // Spiral Vase forces different kind of slicing than the normal model:
             // In Spiral Vase mode, holes are closed and only the largest area contour is kept at each layer.
             // Therefore toggling the Spiral Vase on / off requires complete reslicing.
-            || opt_key == "spiral_vase") {
+            || opt_key == "spiral_vase"
+            || opt_key == "z_step") {
             osteps.emplace_back(posSlice);
         } else if (
                opt_key == "filament_type"
diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp
index 1237c532a..6acaf5e86 100644
--- a/src/libslic3r/PrintObject.cpp
+++ b/src/libslic3r/PrintObject.cpp
@@ -715,8 +715,7 @@ namespace Slic3r {
                 || opt_key == "hole_size_compensation"
                 || opt_key == "hole_size_threshold"
                 || opt_key == "hole_to_polyhole"
-                || opt_key == "hole_to_polyhole_threshold"
-                || opt_key == "z_step") {
+                || opt_key == "hole_to_polyhole_threshold") {
                 steps.emplace_back(posSlice);
             } else if (opt_key == "support_material") {
                 steps.emplace_back(posSupportMaterial);
@@ -750,7 +749,8 @@ namespace Slic3r {
                 steps.emplace_back(posSupportMaterial);
             } else if (opt_key == "bottom_solid_layers") {
                 steps.emplace_back(posPrepareInfill);
-                if (m_print->config().spiral_vase) {
+                if (m_print->config().spiral_vase
+                || opt_key == "z_step") {
                     // Changing the number of bottom layers when a spiral vase is enabled requires re-slicing the object again.
                     // Otherwise, holes in the bottom layers could be filled, as is reported in GH #5528.
                     steps.emplace_back(posSlice);