diff --git a/src/serum-decode.cpp b/src/serum-decode.cpp
index 47f42a6..f88aacd 100644
--- a/src/serum-decode.cpp
+++ b/src/serum-decode.cpp
@@ -4402,25 +4402,22 @@ uint32_t Serum_ColorizeWithMetadatav1(uint8_t* frame) {
     if (showStatusMessages) ignoreUnknownFramesTimeout = 0x2000;
   }
   if (frameID != IDENTIFY_NO_FRAME && !showStatusMessages) {
-    // Ignore any triggers for full black frames as they appear in-game and in
-    // monochrome settings mode and we don't know what authors did with them
-    // (accidentally). Black frames in-game should be shown. In monochrome
-    // settings mode, they should not end the monochrome mode.
-    if (!IsFullBlackFrame(frame, g_serumData.fwidth * g_serumData.fheight)) {
+    // Black frames can distort a monochrome stream. Example: flashing text in
+    // a WPC settings menu. This could trigger a random black frame in the
+    // project, if this black frame doesn't have the appropriate monochrome
+    // trigger, it would end the monochrome stream and stay stuck on a black
+    // frame until a frame in the project is detected again. The code below
+    // takes care of that.
+    if ((!monochromeMode && !monochromePaletteMode) ||
+        !IsFullBlackFrame(frame, g_serumData.fwidth * g_serumData.fheight)) {
       monochromeMode =
           (g_serumData.triggerIDs[lastfound][0] == MONOCHROME_TRIGGER_ID);
       monochromePaletteMode = false;
-      if (g_serumData.triggerIDs[lastfound][0] > 0xff98)
-        g_serumData.triggerIDs[lastfound][0] = 0xffffffff;
-    } else {
-      if (monochromeMode)
-        g_serumData.triggerIDs[lastfound][0] = MONOCHROME_TRIGGER_ID;
-      else if (monochromePaletteMode)
-        g_serumData.triggerIDs[lastfound][0] = MONOCHROME_PALETTE_TRIGGER_ID;
-      else
-        g_serumData.triggerIDs[lastfound][0] = 0xffffffff;
     }
 
+    if (g_serumData.triggerIDs[lastfound][0] > 0xff98)
+      g_serumData.triggerIDs[lastfound][0] = 0xffffffff;
+
     lastframe_found = now;
     if (maxFramesToSkip) {
       framesSkippedCounter = 0;
@@ -4716,11 +4713,14 @@ static uint32_t Serum_ColorizeWithMetadatav2Internal(uint8_t* frame,
     if (showStatusMessages) ignoreUnknownFramesTimeout = 0x2000;
   }
   if (frameID != IDENTIFY_NO_FRAME && !showStatusMessages) {
-    // Ignore any triggers for full black frames as they appear in-game and in
-    // monochrome settings mode and we don't know what authors did with them
-    // (accidentally). Black frames in-game should be shown. In monochrome
-    // settings mode, they should not end the monochrome mode.
-    if (!IsFullBlackFrame(frame, g_serumData.fwidth * g_serumData.fheight)) {
+    // Black frames can distort a monochrome stream. Example: flashing text in
+    // a WPC settings menu. This could trigger a random black frame in the
+    // project, if this black frame doesn't have the appropriate monochrome
+    // trigger, it would end the monochrome stream and stay stuck on a black
+    // frame until a frame in the project is detected again. The code below
+    // takes care of that.
+    if ((!monochromeMode && !monochromePaletteMode) ||
+        !IsFullBlackFrame(frame, g_serumData.fwidth * g_serumData.fheight)) {
       monochromeMode =
           (g_serumData.triggerIDs[lastfound][0] == MONOCHROME_TRIGGER_ID);
       monochromePaletteMode = false;
@@ -4729,16 +4729,9 @@ static uint32_t Serum_ColorizeWithMetadatav2Internal(uint8_t* frame,
         monochromePaletteMode = CaptureMonochromePaletteFromFrameV2(lastfound);
         monochromeMode = false;
       }
-      if (g_serumData.triggerIDs[lastfound][0] > 0xff98)
-        g_serumData.triggerIDs[lastfound][0] = 0xffffffff;
-    } else {
-      if (monochromeMode)
-        g_serumData.triggerIDs[lastfound][0] = MONOCHROME_TRIGGER_ID;
-      else if (monochromePaletteMode)
-        g_serumData.triggerIDs[lastfound][0] = MONOCHROME_PALETTE_TRIGGER_ID;
-      else
-        g_serumData.triggerIDs[lastfound][0] = 0xffffffff;
     }
+    if (g_serumData.triggerIDs[lastfound][0] > 0xff98)
+      g_serumData.triggerIDs[lastfound][0] = 0xffffffff;
 
     if (!monochromeMode && g_serumData.sceneGenerator->isActive() &&
         !sceneFrameRequested &&