diff --git a/patches/api/0475-Expose-hasColor-to-leather-armor.patch b/patches/api/0476-Expose-hasColor-to-leather-armor.patch
similarity index 90%
rename from patches/api/0475-Expose-hasColor-to-leather-armor.patch
rename to patches/api/0476-Expose-hasColor-to-leather-armor.patch
index 3b539b4fe6..df21a83f91 100644
--- a/patches/api/0475-Expose-hasColor-to-leather-armor.patch
+++ b/patches/api/0476-Expose-hasColor-to-leather-armor.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose #hasColor to leather armor
 
 
 diff --git a/src/main/java/org/bukkit/inventory/meta/LeatherArmorMeta.java b/src/main/java/org/bukkit/inventory/meta/LeatherArmorMeta.java
-index 4eadbcf766e69459c036a28f6e43523170558308..c933fae0fb87f3a58e8f549e8870fba436288fa8 100644
+index 7f9eabcaa4d803ee524a9cc8717379fe6a93a5af..496f4b256406a4f38f36471f57d8529b3f29b6a1 100644
 --- a/src/main/java/org/bukkit/inventory/meta/LeatherArmorMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/LeatherArmorMeta.java
 @@ -33,4 +33,14 @@ public interface LeatherArmorMeta extends ItemMeta {
diff --git a/patches/server/0005-Paper-config-files.patch b/patches/server/0005-Paper-config-files.patch
index 8099fa4cd3..d10f5c55f6 100644
--- a/patches/server/0005-Paper-config-files.patch
+++ b/patches/server/0005-Paper-config-files.patch
@@ -487,7 +487,7 @@ index 0000000000000000000000000000000000000000..7684e71f802f3d19e5340713b45cc848
 +}
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..4a34a49f12b106976ba19436f96f74ebb068249c
+index 0000000000000000000000000000000000000000..892351c3b6397b3cde6a31a6594c0e16bbe1252b
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 @@ -0,0 +1,311 @@
@@ -679,7 +679,7 @@ index 0000000000000000000000000000000000000000..4a34a49f12b106976ba19436f96f74eb
 +
 +    public class Scoreboards extends ConfigurationPart {
 +        public boolean trackPluginScoreboards = false;
-+        public boolean saveEmptyScoreboardTeams = false;
++        public boolean saveEmptyScoreboardTeams = true;
 +    }
 +
 +    @SuppressWarnings("unused") // used in postProcess