diff --git a/src/NoteDataWithScoring.cpp b/src/NoteDataWithScoring.cpp
index 633e5d4cc4..7cf2f2ce84 100644
--- a/src/NoteDataWithScoring.cpp
+++ b/src/NoteDataWithScoring.cpp
@@ -153,7 +153,10 @@ int LastTapNoteScoreTrack( const NoteData &in, unsigned iRow, PlayerNumber pn )
 	{
 		/* Skip empty tracks and mines */
 		const TapNote &tn = in.GetTapNote( t, iRow );
-		if( tn.type == TapNote::empty || tn.type == TapNote::mine || tn.type == TapNote::fake ) 
+		if (tn.type == TapNote::empty ||
+			tn.type == TapNote::mine ||
+			tn.type == TapNote::fake ||
+			tn.type == TapNote::autoKeysound) 
 			continue;
 		if( tn.pn != PLAYER_INVALID && tn.pn != pn && pn != PLAYER_INVALID )
 			continue;
@@ -187,7 +190,10 @@ int MinTapNoteScoreTrack( const NoteData &in, unsigned iRow, PlayerNumber pn )
 	{
 		// Skip empty tracks and mines
 		const TapNote &tn = in.GetTapNote( t, iRow );
-		if( tn.type == TapNote::empty || tn.type == TapNote::mine || tn.type == TapNote::fake ) 
+		if (tn.type == TapNote::empty ||
+			tn.type == TapNote::mine ||
+			tn.type == TapNote::fake ||
+			tn.type == TapNote::autoKeysound) 
 			continue;
 		if( tn.pn != PLAYER_INVALID && tn.pn != pn && pn != PLAYER_INVALID )
 			continue;