diff --git a/alttp_sm_combo_randomizer_rom/src/sm/msu.asm b/alttp_sm_combo_randomizer_rom/src/sm/msu.asm
index c4bb18ed2..2469fa836 100644
--- a/alttp_sm_combo_randomizer_rom/src/sm/msu.asm
+++ b/alttp_sm_combo_randomizer_rom/src/sm/msu.asm
@@ -523,13 +523,12 @@ ComputeResumeAndVolume:
sep #$20 ; Return to 8-bit mode
bra .NoFade
.CheckResume
- ;; If the outgoing track is Item/Elevator Room, set the MSU volume low so we can fade in
- ;; But only if the incoming track is the one we set to resume above and we haven't timed out
lda.w !CURRENT_MSU_TRACK
- CMP #!TRACK_ITEM_ROOM : BNE .NoFade
;; If the outgoing track is Samus Fanfare, never resume
- lda.w !CURRENT_MSU_TRACK
- CMP #!TRACK_SAMUS_FANFARE : BEQ .NoFade
+ CMP #!TRACK_SAMUS_FANFARE : BEQ .ResetResume
+ ;; If the outgoing track is Item/Elevator Room, we might fade in
+ CMP #!TRACK_ITEM_ROOM : BNE .NoFade
+ ;; Check if the incoming track is the one we set to resume above and we haven't timed out
pla ; Load the incoming track back into the accumulator...
pha ; ...but keep it on the stack because we need it again at the end of the block.
CMP !RESUME_MSU_TRACK : BNE .NoFade
@@ -540,7 +539,7 @@ ComputeResumeAndVolume:
cmp.w !NO_RESUME_AFTER_LO
+
sep #$20 ; Return to 8-bit mode
- bcs .ResetResume ; Greater than or equal to
+ bcs .ResetResume ; Greater than or equal to means we timed out
.SetFade
lda.b #!MIN_VOLUME
bra .FadeDone
diff --git a/src/TrackerCouncil.Smz3.SeedGenerator/FileData/IpsPatches/zsm.ips b/src/TrackerCouncil.Smz3.SeedGenerator/FileData/IpsPatches/zsm.ips
index 56fa1faf6..d248bbb8f 100644
Binary files a/src/TrackerCouncil.Smz3.SeedGenerator/FileData/IpsPatches/zsm.ips and b/src/TrackerCouncil.Smz3.SeedGenerator/FileData/IpsPatches/zsm.ips differ
diff --git a/src/TrackerCouncil.Smz3.UI.Legacy/TrackerCouncil.Smz3.UI.Legacy.csproj b/src/TrackerCouncil.Smz3.UI.Legacy/TrackerCouncil.Smz3.UI.Legacy.csproj
index 7bc95b9d3..a1004b582 100644
--- a/src/TrackerCouncil.Smz3.UI.Legacy/TrackerCouncil.Smz3.UI.Legacy.csproj
+++ b/src/TrackerCouncil.Smz3.UI.Legacy/TrackerCouncil.Smz3.UI.Legacy.csproj
@@ -5,7 +5,7 @@