diff --git a/src/app/channel/media/queue.js b/src/app/channel/media/queue.js
index 8fa933f..ec44c81 100644
--- a/src/app/channel/media/queue.js
+++ b/src/app/channel/media/queue.js
@@ -1209,6 +1209,12 @@ class queue{
                 return this.endLivestream(wasPlaying, chanDB)
             }
 
+
+            //Moved this from the block below to prevent accidental over-caching
+            //We may need to throw this into it's own conditional if it causes issues
+            //Take it out of the active schedule
+            this.schedule.delete(wasPlaying.startTime);
+
             //If we're not in volatile mode and we're not ending a livestream
             if(!volatile){
                 //If we wheren't handed a channel
@@ -1229,9 +1235,6 @@ class queue{
                     await chanDB.media.nowPlaying.deleteOne();
                 }
 
-                //Take it out of the active schedule
-                this.schedule.delete(wasPlaying.startTime);
-
                 //If archiving is enabled
                 if(!noArchive){
                     //Add the item to the channel archive