diff --git a/src/main/java/com/gmail/nossr50/runnables/database/UUIDUpdateAsyncTask.java b/src/main/java/com/gmail/nossr50/runnables/database/UUIDUpdateAsyncTask.java
index 54504e8c6..98a582ccd 100644
--- a/src/main/java/com/gmail/nossr50/runnables/database/UUIDUpdateAsyncTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/database/UUIDUpdateAsyncTask.java
@@ -20,7 +20,7 @@ public class UUIDUpdateAsyncTask extends BukkitRunnable {
     private static final int MAX_LOOKUP = Math.max(HiddenConfig.getInstance().getUUIDConvertAmount(), 100);
     private static final int RATE_LIMIT = HiddenConfig.getInstance().getMojangRateLimit();
     private static final long LIMIT_PERIOD = HiddenConfig.getInstance().getMojangLimitPeriod();
-    private static final int BATCH_SIZE = 5000;
+    private static final int BATCH_SIZE = MAX_LOOKUP * 3;
 
     private List<String> userNames;
     private int size;
diff --git a/src/main/resources/hidden.yml b/src/main/resources/hidden.yml
index bba05227f..c79be996c 100644
--- a/src/main/resources/hidden.yml
+++ b/src/main/resources/hidden.yml
@@ -11,9 +11,9 @@ Options:
     EnchantmentBuffs: true
 
     # Amount of users to convert every interval
-    UUIDConvertAmount: 50
+    UUIDConvertAmount: 100
     # Amount of users to be converted at a time before waiting MojangLimitPeriod milliseconds to begin again
     # This setting is for large servers to avoid being temp banned from mojang api
-    MojangRateLimit: 200
+    MojangRateLimit: 300
     # Amount of time to wait after hitting the MojangRateLimit in UUID conversion
-    MojangLimitPeriod: 1500
+    MojangLimitPeriod: 6000