diff --git a/Spigot-Server-Patches/Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/Basic-PlayerProfile-API.patch
index 5081a979bc..3e606e69bb 100644
--- a/Spigot-Server-Patches/Basic-PlayerProfile-API.patch
+++ b/Spigot-Server-Patches/Basic-PlayerProfile-API.patch
@@ -170,7 +170,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            }
 +        }
 +
-+        if (profile.getName() == null || !hasTextures()) {
++        if ((profile.getName() == null || !hasTextures()) && profile.getId() != null) {
 +            GameProfile profile = userCache.getProfile(this.profile.getId());
 +            if (profile != null) {
 +                // if old has it, assume its newer, so overwrite, else use cached if it was set and ours wasn't