diff --git a/stepmania/src/ScoreKeeperMAX2.cpp b/stepmania/src/ScoreKeeperMAX2.cpp
index 3fded68471..4bb467beca 100644
--- a/stepmania/src/ScoreKeeperMAX2.cpp
+++ b/stepmania/src/ScoreKeeperMAX2.cpp
@@ -477,7 +477,7 @@ int ScoreKeeperMAX2::TapNoteScoreToDancePoints( TapNoteScore tns )
 	case PLAY_MODE_ONI:
 		switch( tns )
 		{
-		case TNS_MARVELOUS:	return +3;
+		case TNS_MARVELOUS:	return (PREFSMAN->m_bDancePointsForOni ? +3 : +2);
 		case TNS_PERFECT:	return +2;
 		case TNS_GREAT:		return +1;
 		case TNS_GOOD:		return +0;