diff --git a/Spigot-Server-Patches/0127-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0127-Configurable-Player-Collision.patch
index a74042802..92a2de47a 100644
--- a/Spigot-Server-Patches/0127-Configurable-Player-Collision.patch
+++ b/Spigot-Server-Patches/0127-Configurable-Player-Collision.patch
@@ -1,4 +1,4 @@
-From 2101a61a8d3df8d0dc1fd0164f8a45bbba2ba9cf Mon Sep 17 00:00:00 2001
+From 584b8849dacaeaf44c6c2781d1ebcfc6a6e59526 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 02:10:49 -0400
 Subject: [PATCH] Configurable Player Collision
@@ -32,17 +32,18 @@ index d8ec504..eb45d3c 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 91e52f9..f75d996 100644
+index 91e52f9..f133b32 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -241,6 +241,13 @@ public abstract class PlayerList {
+@@ -241,6 +241,14 @@ public abstract class PlayerList {
      public void sendScoreboard(ScoreboardServer scoreboardserver, EntityPlayer entityplayer) {
          HashSet hashset = Sets.newHashSet();
          Iterator iterator = scoreboardserver.getTeams().iterator();
 +        
 +        // Paper start - Send a fake team to the client to initialize collision rule if no others exist
 +        if (!com.destroystokyo.paper.PaperConfig.enablePlayerCollisions && !iterator.hasNext()) {
-+            entityplayer.playerConnection.sendPacket(new PacketPlayOutScoreboardTeam(new ScoreboardTeam(scoreboardserver, "collideRule"), 0));
++            String teamName = org.apache.commons.lang3.StringUtils.left("collideRule_" + entityplayer.getWorld().random.nextInt(), 16);
++            entityplayer.playerConnection.sendPacket(new PacketPlayOutScoreboardTeam(new ScoreboardTeam(scoreboardserver, teamName), 0));
 +            return;
 +        }
 +        // Paper end