diff --git a/server/server.js b/server/server.js
index 583e1a98..0ed23b52 100755
--- a/server/server.js
+++ b/server/server.js
@@ -314,16 +314,16 @@ io.on('connection', function(socket){
         {
       		if(!docs[0]["skip"] || (docs[0]["adminpass"] == hash && docs[0]["adminpass"] != "") || error)
       		{
-      			if((lists[coll].length/2 <= docs[0]["skips"].length+1 && !contains(docs[0]["skips"], guid) && (get_time() - docs[0]["startTime"] >= 10
-             || lists[coll].length != 2)) || (docs[0]["adminpass"] == adminpass && docs[0]["adminpass"] != ""))
+      			if((lists[coll].length/2 <= docs[0]["skips"].length+1 && !contains(docs[0]["skips"], guid))
+              || (docs[0]["adminpass"] == adminpass && docs[0]["adminpass"] != ""))
       			{
       				change_song(coll);
               socket.emit("toast", "skip");
               io.sockets.emit('chat,'+coll, rndName(guid) + " skipped");
-      			}else if(get_time() - docs[0]["startTime"] < 10 && lists[coll].length == 2 && !error)
+      			}/*else if(get_time() - docs[0]["startTime"] < 10 && lists[coll].length == 2 && !error)
             {
               socket.emit("toast", "notyetskip");
-            }else if(!contains(docs[0]["skips"], guid)){
+            }*/else if(!contains(docs[0]["skips"], guid)){
       				db.collection(coll).update({views:{$exists:true}}, {$push:{skips:guid}}, function(err, d){
                 socket.emit("toast", (Math.ceil(lists[coll].length/2) - docs[0]["skips"].length-1) + " more are needed to skip!");
                 socket.broadcast.emit('chat,'+coll, rndName(guid) + " voted to skip");