diff --git a/source/blender/nodes/intern/shader_nodes_inline.cc b/source/blender/nodes/intern/shader_nodes_inline.cc
index 5034bbc54d3..026b590b4fe 100644
--- a/source/blender/nodes/intern/shader_nodes_inline.cc
+++ b/source/blender/nodes/intern/shader_nodes_inline.cc
@@ -617,12 +617,11 @@ class ShaderNodesInliner {
     const std::optional<PrimitiveSocketValue> iterations_value_opt =
         iterations_socket_value->to_primitive(*iterations_input->typeinfo);
     if (!iterations_value_opt) {
-      /* Number of iterations is not a primitive value. */
-      this->store_socket_value_fallback(socket);
       this->add_dynamic_repeat_zone_iterations_error(*repeat_input_node);
-      return;
     }
-    const int iterations = std::get<int>(iterations_value_opt->value);
+    const int iterations = iterations_value_opt.has_value() ?
+                               std::get<int>(iterations_value_opt->value) :
+                               0;
     if (iterations <= 0) {
       /* If the number of iterations is zero, the values are copied directly from the repeat input
        * node. */
diff --git a/tests/files/render/node_inlining/cycles_renders/repeat_zones.png b/tests/files/render/node_inlining/cycles_renders/repeat_zones.png
index 7d8855a9ca0..9b75e498a6f 100644
--- a/tests/files/render/node_inlining/cycles_renders/repeat_zones.png
+++ b/tests/files/render/node_inlining/cycles_renders/repeat_zones.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7557336ebbb9fd6da1b090517281e1883eb9cf4030f4dbd064b26e8e67833480
-size 5057
+oid sha256:1a76e89f0b4fd23b99757d6d577acbf9b3cfa399726c8eccd31ce3ea9bb36c0a
+size 5045
diff --git a/tests/files/render/node_inlining/eevee_renders/repeat_zones.png b/tests/files/render/node_inlining/eevee_renders/repeat_zones.png
index 738914a509b..f3f1faf4281 100644
--- a/tests/files/render/node_inlining/eevee_renders/repeat_zones.png
+++ b/tests/files/render/node_inlining/eevee_renders/repeat_zones.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8b1399ee6daf3ff70b5911eb7ca9050545b188314b1ff87853762311d1f11cbc
-size 2031
+oid sha256:253bd42157ae0d937977d29789bb98615382ed8843da915e855233cb6554b171
+size 2033
diff --git a/tests/files/render/node_inlining/storm_hydra_renders/repeat_zones.png b/tests/files/render/node_inlining/storm_hydra_renders/repeat_zones.png
index ba769beb952..8a0c6c1815a 100644
--- a/tests/files/render/node_inlining/storm_hydra_renders/repeat_zones.png
+++ b/tests/files/render/node_inlining/storm_hydra_renders/repeat_zones.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65ddc4905348061e88c82ea0ee3ce6df50d982c9928cdd1066d245ad270a0c0c
-size 1104
+oid sha256:b56356a4dfa66f289dc18b92b2cadf0aeeab7e49ba3ca63f66cee16e65a8b1b5
+size 1125
diff --git a/tests/files/render/node_inlining/storm_usd_renders/repeat_zones.png b/tests/files/render/node_inlining/storm_usd_renders/repeat_zones.png
index 535132e30d1..51ab5515e0c 100644
--- a/tests/files/render/node_inlining/storm_usd_renders/repeat_zones.png
+++ b/tests/files/render/node_inlining/storm_usd_renders/repeat_zones.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:caba438137b2e70aa96e270735dabc39970a2a8ec1b9291ddda498cdd40aea74
-size 1104
+oid sha256:1ca4f40c9ade7347d5211f5e6523363f93a5d6cf93f4acc73f4b230d47b3c6ac
+size 1125