diff --git a/src/main/java/us/ajg0702/queue/Main.java b/src/main/java/us/ajg0702/queue/Main.java
index bfa0896..ca8bd0c 100644
--- a/src/main/java/us/ajg0702/queue/Main.java
+++ b/src/main/java/us/ajg0702/queue/Main.java
@@ -3,8 +3,6 @@ package us.ajg0702.queue;
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.concurrent.Callable;
 
diff --git a/src/main/java/us/ajg0702/queue/Manager.java b/src/main/java/us/ajg0702/queue/Manager.java
index 2adaafd..ef4a793 100644
--- a/src/main/java/us/ajg0702/queue/Manager.java
+++ b/src/main/java/us/ajg0702/queue/Manager.java
@@ -390,7 +390,8 @@ public class Manager {
 		}
 		int pos = list.indexOf(p)+1;
 		int len = list.size();
-		if(list.size() <= 1) {
+		if(list.size() <= 1 && server.isOnline() && server.canAccess(p) && !server.isFull() && !server.isWhitelisted()) {
+			sendPlayers(s);
 			p.sendMessage(Main.formatMessage(
 					msgs.get("status.now-in-empty-queue")
 					.replaceAll("\\{POS\\}", pos+"")
@@ -410,10 +411,6 @@ public class Manager {
 		BungeeUtils.sendCustomData(p, "positionof", len+"");
 		BungeeUtils.sendCustomData(p, "queuename", s);
 		BungeeUtils.sendCustomData(p, "inqueue", "true");
-		
-		if(list.size() <= 1) {
-			sendPlayers(s);
-		}
 	}
 	
 	/**
@@ -427,4 +424,8 @@ public class Manager {
 		}
 		return null;
 	}
+	
+	public Server getServer(String name) {
+		return findServer(name);
+	}
 }
diff --git a/src/main/java/us/ajg0702/queue/Server.java b/src/main/java/us/ajg0702/queue/Server.java
index e599ce5..9c6d458 100644
--- a/src/main/java/us/ajg0702/queue/Server.java
+++ b/src/main/java/us/ajg0702/queue/Server.java
@@ -92,6 +92,9 @@ public class Server {
 	public boolean getWhitelisted() {
 		return whitelisted;
 	}
+	public boolean isWhitelisted() {
+		return whitelisted;
+	}
 	public List<String> getWhitelistedPlayers() {
 		return whitelistedplayers;
 	}