diff --git a/src/main/java/us/ajg0702/queue/Main.java b/src/main/java/us/ajg0702/queue/Main.java
index 5b9e545..666d3e3 100644
--- a/src/main/java/us/ajg0702/queue/Main.java
+++ b/src/main/java/us/ajg0702/queue/Main.java
@@ -84,6 +84,7 @@ public class Main extends Plugin implements Listener {
 				offlineTime.put(server, ot);
 				for(ProxiedPlayer ply : plys) {
 					int pos = plys.indexOf(ply)+1;
+					if(pos == 0) continue;
 					int len = plys.size();
 					if(notif) {
 						String or = msgs.get("status.offline.restarting");
@@ -226,6 +227,9 @@ public class Main extends Plugin implements Listener {
 				}
 				i++;
 			}
+			if(list.size() == 0) {
+				list.add(p);
+			}
 		} else {
 			list.add(p);
 		}