diff --git a/Vocaluxe/Base/CGame.cs b/Vocaluxe/Base/CGame.cs
index a6323536..ce8a7827 100644
--- a/Vocaluxe/Base/CGame.cs
+++ b/Vocaluxe/Base/CGame.cs
@@ -310,11 +310,17 @@ namespace Vocaluxe.Base
                             {
                                 if (Note == lines[Line].NoteCount - 1)
                                 {
-                                    if (notes[Note].EndBeat == beat)
+                                    if (notes[Note].EndBeat == beat
+                                        || (_GameMode.GetCurrentGameMode() == EGameMode.TR_GAMEMODE_MEDLEY && song.Medley.EndBeat == beat)
+                                        || (_GameMode.GetCurrentGameMode() == EGameMode.TR_GAMEMODE_SHORTSONG && song.ShortEnd == beat))
                                         _Player[p].SongFinished = true;
                                 }
                             }
 
+                            if ((_GameMode.GetCurrentGameMode() == EGameMode.TR_GAMEMODE_MEDLEY && song.Medley.EndBeat == beat) ||
+                                (_GameMode.GetCurrentGameMode() == EGameMode.TR_GAMEMODE_SHORTSONG && song.ShortEnd == beat))
+                                _Player[p].SongFinished = true;
+
                             if (notes[Note].PointsForBeat > 0 && (CSound.RecordToneValid(p) || DEBUG_HIT))
                             {
                                 int Tone = notes[Note].Tone;