diff --git a/modules/active_modifier.py b/modules/active_modifier.py
index 5aef2dd..8989bba 100644
--- a/modules/active_modifier.py
+++ b/modules/active_modifier.py
@@ -84,6 +84,10 @@ class Module(ActiveModifier):
                 self.last_track = Track(song, next_track_fade_in, last_track_fade_out, official, {}, focus_time_offset=-next_track_fade_in)
                 next_track = track
             self.limit_tracks = False
+            if self.skip_next:
+                logger.info("Skip next flag was on, skipping this song.")
+                self.skip_next = False
+                return (None, None), None
             return (self.last_track, next_track), True
         elif len(self.originals):
             self.last_track = self.originals.pop(0)
diff --git a/modules/web.html b/modules/web.html
index 3530330..eb2c4eb 100644
--- a/modules/web.html
+++ b/modules/web.html
@@ -181,6 +181,7 @@
                 } else if(msg.event === "new_track"){
                     applyTrackState(msg.data);
                     ws.send(JSON.stringify({action:"get_toplay"}));
+                    ws.send(JSON.stringify({action:"skip_next",set:false}));
                 } else if(msg.event === "progress"){
                     applyProgressState(msg.data);
                 } else if(msg.event === "toplay") {