diff --git a/packages/spacebars-tests/template_tests.html b/packages/spacebars-tests/template_tests.html
index 3d9b4a0e17..e53344f1b9 100644
--- a/packages/spacebars-tests/template_tests.html
+++ b/packages/spacebars-tests/template_tests.html
@@ -563,6 +563,23 @@ Hi there!
   {{/each}}
 </template>
 
+<template name="spacebars_test_helpers_stop_with_each1">
+  {{#with options}}
+    {{> spacebars_test_helpers_stop_with_each3}}
+  {{/with}}
+</template>
+
+<template name="spacebars_test_helpers_stop_with_each2">
+  {{#with options}}
+    {{> spacebars_test_helpers_stop_with_each3}}
+  {{/with}}
+</template>
+
+<template name="spacebars_test_helpers_stop_with_each3">
+  {{#each this}}
+  {{/each}}
+</template>
+
 <template name="spacebars_test_helpers_stop_if1">
   {{#if options}}
     one
diff --git a/packages/spacebars-tests/template_tests.js b/packages/spacebars-tests/template_tests.js
index 529157ac99..1d5804d30f 100644
--- a/packages/spacebars-tests/template_tests.js
+++ b/packages/spacebars-tests/template_tests.js
@@ -1708,6 +1708,10 @@ Tinytest.add('spacebars - template - each stops without re-running helper', func
   runOneTwoTest(test, 'spacebars_test_helpers_stop_each');
 });
 
+Tinytest.add('spacebars - template - each inside with stops without re-running helper', function (test) {
+  runOneTwoTest(test, 'spacebars_test_helpers_stop_with_each');
+});
+
 Tinytest.add('spacebars - template - if stops without re-running helper', function (test) {
   runOneTwoTest(test, 'spacebars_test_helpers_stop_if', ['a', 'b', 'a']);
 });