diff --git a/stepmania/src/ScoreKeeperMAX2.cpp b/stepmania/src/ScoreKeeperMAX2.cpp
index 4bb467beca..6011f65e1b 100644
--- a/stepmania/src/ScoreKeeperMAX2.cpp
+++ b/stepmania/src/ScoreKeeperMAX2.cpp
@@ -509,7 +509,7 @@ int ScoreKeeperMAX2::HoldNoteScoreToDancePoints( HoldNoteScore hns )
 	case PLAY_MODE_ONI:
 		switch( hns )
 		{
-		case HNS_OK:	return GAMESTATE->ShowMarvelous()? +3:+2;
+		case HNS_OK:	return GAMESTATE->ShowMarvelous() && PREFSMAN->m_bDancePointsForOni ? +3:+2;
 		case HNS_NG:	return +0;
 		}
 		break;