diff --git a/botthread.c b/botthread.c
index ee28e3e..7adbde4 100644
--- a/botthread.c
+++ b/botthread.c
@@ -475,7 +475,7 @@
         writeLog(0,"Need To Find Next Song For: %s, From User: %s\n",tmpChans->channel,tmpChans->nextUser->user->userInfo.username);
         tmpChans->count++;
         }
-      else {
+      else if (tmpChans->modes[CHAN_SCHEDULED] == 0) {
         tmpChans->count = MAX_COUNT;
         goto findUser;
         }
diff --git a/channel.c b/channel.c
index 6f7934a..485c1ce 100644
--- a/channel.c
+++ b/channel.c
@@ -247,6 +247,9 @@
         tmpUsers->next->prev = tmpUsers->prev;
 
       if (tmpChannel->nextUser == tmpUsers) {
+        if (tmpChannel->modes[CHAN_SCHEDULED] == 1)
+          tmpChannel->modes[CHAN_SCHEDULED] = 0;
+
         if (tmpUsers->next != 0x0)
           tmpChannel->nextUser = tmpUsers->next;
         else if (tmpChannel->users != 0x0)