diff --git a/server/handlers/list.js b/server/handlers/list.js
index 407656cb..9d0f1e9d 100644
--- a/server/handlers/list.js
+++ b/server/handlers/list.js
@@ -141,7 +141,10 @@ function skip(list, guid, coll, offline, socket, callback) {
                 return;
             }
         }
-
+        if(!list.hasOwnProperty("id") || list.id == undefined) {
+            socket.emit('toast', "The list is empty.");
+            return;
+        }
         if(!list.hasOwnProperty("id") || !list.hasOwnProperty("channel") ||
             (typeof(list.id) != "string" && typeof(list.id) != "number") || typeof(list.channel) != "string") {
                 var result = {
@@ -299,6 +302,9 @@ function change_song(coll, error, id, conf, callback, socket) {
             }, {
                 $limit:2
             }], function(err, now_playing_doc){
+                if(now_playing_doc.length == 0) {
+                    console.log("empty list", coll, callback, id, conf);
+                }
                 if(now_playing_doc.length > 0 && ((id && id == now_playing_doc[0].id) || !id)) {
                     if(error && now_playing_doc[0].source == "youtube"){
                         request('http://img.youtube.com/vi/'+now_playing_doc[0].id+'/mqdefault.jpg', function (err, response, body) {
diff --git a/server/public/partials/channel/settings.handlebars b/server/public/partials/channel/settings.handlebars
index b059b7af..653f9937 100644
--- a/server/public/partials/channel/settings.handlebars
+++ b/server/public/partials/channel/settings.handlebars
@@ -112,7 +112,7 @@
                         </label>
                     </div>
                 </li>
-                <li>
+                <li class="chat-toggle-li hide">
                     <span class="switch-text">
                         Strict skip
                     </span>