diff --git a/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GroupStatusData.java b/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GroupStatusData.java
index 145399fce..acfd4969b 100644
--- a/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GroupStatusData.java
+++ b/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GroupStatusData.java
@@ -44,7 +44,7 @@ public class GroupStatusData
 						// Lobby joinable checking
 						if (existingServer.Motd.isEmpty() || existingServer.Motd.equals(""))
 						{
-							if (serverStatusData.MaxPlayers - serverStatusData.Players > 15)
+							if (serverStatusData.MaxPlayers - serverStatusData.Players > 20)
 								_joinableCount--;
 						}
 						else
@@ -66,7 +66,7 @@ public class GroupStatusData
 				// Lobby joinable checking
 				if (serverStatusData.Motd.isEmpty() || serverStatusData.Motd.equals(""))
 				{
-					if (serverStatusData.MaxPlayers - serverStatusData.Players > 15)
+					if (serverStatusData.MaxPlayers - serverStatusData.Players > 20)
 					{
 						_joinableCount++;
 					}
diff --git a/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java b/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
index 45746e3ef..977e0da1b 100644
--- a/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
+++ b/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
@@ -141,6 +141,13 @@ public class ServerMonitor
 					int serversToAdd = Math.max(serverGroup.RequiredTotalServers - groupStatus.getTotalServers(), serverGroup.RequiredJoinableServers - groupStatus.getJoinableCount());
 					int serversToKill = (groupStatus.getTotalServers() > serverGroup.RequiredTotalServers && groupStatus.getJoinableCount() > serverGroup.RequiredJoinableServers) ? Math.min(groupStatus.getJoinableCount() - serverGroup.RequiredJoinableServers, groupStatus.EmptyServers.size()) : 0;
 	
+					// Minimum 1500 slot bufferzone
+					if (serverGroup.Name.equalsIgnoreCase("Lobby"))
+					{
+						if (groupStatus.MaxPlayers - groupStatus.Players < 1500)
+							serversToAdd = serverGroup.RequiredJoinableServers;
+					}
+					
 					while (serversToAdd > 0)
 					{
 						int serverNum = groupStatus.getNextServerNumber();