diff --git a/Spigot-Server-Patches/0407-Fix-PreFillProfileEvent.patch b/Spigot-Server-Patches/0407-Fix-PreFillProfileEvent.patch
new file mode 100644
index 0000000000..426c89f517
--- /dev/null
+++ b/Spigot-Server-Patches/0407-Fix-PreFillProfileEvent.patch
@@ -0,0 +1,24 @@
+From 510c7b25cfd7517fd29e1c76d1f124f06f58f8b2 Mon Sep 17 00:00:00 2001
+From: BlackHole <black-hole@live.com>
+Date: Thu, 8 Nov 2018 20:04:11 +0100
+Subject: [PATCH] Fix PreFillProfileEvent
+
+
+diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
+index f83aa5ef0..61cfdf73c 100644
+--- a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
++++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
+@@ -21,7 +21,9 @@ public class PaperMinecraftSessionService extends YggdrasilMinecraftSessionServi
+ 
+     @Override
+     public GameProfile fillProfileProperties(GameProfile profile, boolean requireSecure) {
+-        new PreFillProfileEvent(CraftPlayerProfile.asBukkitMirror(profile)).callEvent();
++        CraftPlayerProfile playerProfile = (CraftPlayerProfile) CraftPlayerProfile.asBukkitMirror(profile);
++        new PreFillProfileEvent(playerProfile).callEvent();
++        profile = playerProfile.getGameProfile();
+         if (profile.isComplete() && profile.getProperties().containsKey("textures")) {
+             return profile;
+         }
+-- 
+2.19.1.windows.1
+