diff --git a/generator/internal/scaffold_generator.cc b/generator/internal/scaffold_generator.cc
index d2f788c747008..c951aa227794d 100644
--- a/generator/internal/scaffold_generator.cc
+++ b/generator/internal/scaffold_generator.cc
@@ -983,8 +983,8 @@ int main(int argc, char* argv[]) try {
   auto client = $library$::ServiceClient(
       $library$::MakeServiceConnection());  // EDIT HERE
 
-  for (auto r : client.List/*EDIT HERE*/(location.FullName())) {
-    if (!r) throw std::move(r).status();
+  for (auto const& r : client.List/*EDIT HERE*/(location.FullName())) {
+    if (!r) throw r.status();
     std::cout << r->DebugString() << "\n";
   }
 
diff --git a/generator/internal/scaffold_generator_test.cc b/generator/internal/scaffold_generator_test.cc
index 7ce189110f62e..488112efe1fc3 100644
--- a/generator/internal/scaffold_generator_test.cc
+++ b/generator/internal/scaffold_generator_test.cc
@@ -401,6 +401,7 @@ TEST_F(ScaffoldGenerator, QuickstartSkeleton) {
   auto const actual = std::move(os).str();
   EXPECT_THAT(actual, HasSubstr("2034"));
   EXPECT_THAT(actual, Not(HasSubstr("$copyright_year$")));
+  EXPECT_THAT(actual, HasSubstr("for (auto const& r : client.List"));
 }
 
 TEST_F(ScaffoldGenerator, QuickstartCMake) {