diff --git a/Spigot-Server-Patches/0399-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0399-Don-t-sleep-after-profile-lookups-if-not-needed.patch
new file mode 100644
index 000000000..3e7eedca0
--- /dev/null
+++ b/Spigot-Server-Patches/0399-Don-t-sleep-after-profile-lookups-if-not-needed.patch
@@ -0,0 +1,36 @@
+From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Tue, 23 Oct 2018 20:25:05 -0400
+Subject: [PATCH] Don't sleep after profile lookups if not needed
+
+Mojang was sleeping even if we had no more requests to go after
+the current one finished, resulting in 100ms lost per profile lookup
+
+diff --git a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
+index 7ac07ac07ac0..7ac07ac07ac0 100644
+--- a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
++++ b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
+@@ -42,6 +42,7 @@ public class YggdrasilGameProfileRepository implements GameProfileRepository {
+         }
+ 
+         final int page = 0;
++        boolean hasRequested = false; // Paper
+ 
+         for (final List<String> request : Iterables.partition(criteria, ENTRIES_PER_PAGE)) {
+             int failCount = 0;
+@@ -67,6 +68,12 @@ public class YggdrasilGameProfileRepository implements GameProfileRepository {
+                         LOGGER.debug("Couldn't find profile {}", name);
+                         callback.onProfileLookupFailed(new GameProfile(null, name), new ProfileNotFoundException("Server did not find the requested profile"));
+                     }
++                    // Paper start
++                    if (!hasRequested) {
++                        hasRequested = true;
++                        continue;
++                    }
++                    // Paper end
+ 
+                     try {
+                         Thread.sleep(DELAY_BETWEEN_PAGES);
+-- 
+2.19.1
+
diff --git a/scripts/importmcdev.sh b/scripts/importmcdev.sh
index e3b5dae87..c6b730e1d 100755
--- a/scripts/importmcdev.sh
+++ b/scripts/importmcdev.sh
@@ -104,6 +104,7 @@ done
 #             # group    # lib          # prefix               # many files
 
 # dont forget \ at end of each line but last
+importLibrary com.mojang authlib com/mojang/authlib yggdrasil/YggdrasilGameProfileRepository.java
 
 ########################################################
 ########################################################