diff --git a/railties/lib/rails/generators/rails/app/templates/bin/setup.tt b/railties/lib/rails/generators/rails/app/templates/bin/setup.tt
index e4ba83a129..c6607dbb2b 100644
--- a/railties/lib/rails/generators/rails/app/templates/bin/setup.tt
+++ b/railties/lib/rails/generators/rails/app/templates/bin/setup.tt
@@ -17,7 +17,8 @@ chdir APP_ROOT do
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
 <% unless options[:skip_yarn] %>
-  system('bin/yarn') # Ignore failure from yarn not being installed
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
 
 <% end %>
 <% unless options.skip_active_record -%>
diff --git a/railties/lib/rails/generators/rails/app/templates/bin/update.tt b/railties/lib/rails/generators/rails/app/templates/bin/update.tt
index cc188315a8..d23af018c7 100644
--- a/railties/lib/rails/generators/rails/app/templates/bin/update.tt
+++ b/railties/lib/rails/generators/rails/app/templates/bin/update.tt
@@ -16,10 +16,6 @@ chdir APP_ROOT do
   puts '== Installing dependencies =='
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
-<% unless options[:skip_yarn] %>
-  system('bin/yarn') # Ignore failure from yarn not being installed
-
-<% end %>
 <% unless options.skip_active_record -%>
   puts "\n== Updating database =="
   system! 'bin/rails db:migrate'