diff --git a/src/beatNote/UBeatNote.pas b/src/beatNote/UBeatNote.pas
index 267052a06..9bf2b4a77 100644
--- a/src/beatNote/UBeatNote.pas
+++ b/src/beatNote/UBeatNote.pas
@@ -597,7 +597,7 @@ procedure SingDrawLineBeats(Left, Top, Right: real; Track, PlayerNumber: integer
         with Notes[Count] do
         begin
 
-           if NoteType = ntRap then
+           if (NoteType = ntRap) and CurrentSong.RapBeat then
            begin
                 glColor4f(1, 1, 1, 1);
 
@@ -680,7 +680,7 @@ procedure SingDrawPlayerBGLineBeats(Left, Top, Right: real; Track, PlayerIndex:
       begin
         with Notes[Count] do
         begin
-          if NoteType = ntRap then
+          if (NoteType = ntRap) and CurrentSong.RapBeat then
           begin
             W := NotesW[PlayerIndex] * 3 + 1.5;
             H := NotesH[PlayerIndex] * 1.5 + 3.5;