diff --git a/lib/i18n/backend/discourse_i18n.rb b/lib/i18n/backend/discourse_i18n.rb
index 2fd498f6687..9962206f637 100644
--- a/lib/i18n/backend/discourse_i18n.rb
+++ b/lib/i18n/backend/discourse_i18n.rb
@@ -38,7 +38,7 @@ module I18n
       end
 
       def self.sort_locale_files(files)
-        files.sort_by do |filename|
+        files.sort.sort_by do |filename|
           matches = /(?:client|server)-([1-9]|[1-9][0-9]|100)\..+\.yml/.match(filename)
           matches&.[](1)&.to_i || 0
         end
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index a7933989c35..2a92c6d01d6 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -755,7 +755,7 @@ class Plugin::Instance
       root_path = "#{File.dirname(@path)}/assets/javascripts"
       admin_path = "#{File.dirname(@path)}/admin/assets/javascripts"
 
-      Dir.glob(["#{root_path}/**/*", "#{admin_path}/**/*"]) do |f|
+      Dir.glob(["#{root_path}/**/*", "#{admin_path}/**/*"]).sort.each do |f|
         f_str = f.to_s
         if File.directory?(f)
           yield [f, true]