diff --git a/paper-server/patches/sources/net/minecraft/world/scores/Scoreboard.java.patch b/paper-server/patches/sources/net/minecraft/world/scores/Scoreboard.java.patch
index f2793f732a9b..07ff5d02aba2 100644
--- a/paper-server/patches/sources/net/minecraft/world/scores/Scoreboard.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/scores/Scoreboard.java.patch
@@ -1,5 +1,13 @@
 --- a/net/minecraft/world/scores/Scoreboard.java
 +++ b/net/minecraft/world/scores/Scoreboard.java
+@@ -267,6 +_,7 @@
+         }
+ 
+         this.onTeamRemoved(team);
++        team.getPlayers().clear(); // Paper - Clear scoreboard team entries on unregister
+     }
+ 
+     public boolean addPlayerToTeam(final String player, final PlayerTeam team) {
 @@ -373,7 +_,7 @@
      }