diff --git a/Spigot-Server-Patches/0527-Support-old-UUID-format-for-NBT.patch b/Spigot-Server-Patches/0527-Support-old-UUID-format-for-NBT.patch
new file mode 100644
index 0000000000..a40c1b1746
--- /dev/null
+++ b/Spigot-Server-Patches/0527-Support-old-UUID-format-for-NBT.patch
@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Mon, 29 Jun 2020 03:26:17 -0400
+Subject: [PATCH] Support old UUID format for NBT
+
+We have stored UUID in plenty of places that did not get DFU'd
+
+So just look for old format and load it if it exists.
+
+diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
+index f608b35502890650adfc1df35e0794471f57ecbc..93b25e4580646ccfe8c671511e2250dbe7474a89 100644
+--- a/src/main/java/net/minecraft/server/NBTTagCompound.java
++++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
+@@ -142,6 +142,11 @@ public class NBTTagCompound implements NBTBase {
+     @Nullable public UUID getUUID(String prefix) { return a(prefix); } // Paper - OBFHELPER
+     @Nullable
+     public UUID a(String s) {
++        // Paper start - support old format
++        if (hasKey(s + "Least") && hasKey(s + "Most")) {
++            return new UUID(this.getLong(s + "Most"), this.getLong(s + "Least"));
++        }
++        // Paper end
+         return GameProfileSerializer.a(this.get(s));
+     }
+