diff --git a/stepmania/src/RageSound.cpp b/stepmania/src/RageSound.cpp
index 04c1983a31..c0e29982b0 100644
--- a/stepmania/src/RageSound.cpp
+++ b/stepmania/src/RageSound.cpp
@@ -887,8 +887,6 @@ float RageSound::GetAbsoluteVolume() const
 {
 	float f = m_Param.m_Volume;
 	f *= SOUNDMAN->GetMixVolume();
-	if( SOUNDMAN->GetPlayOnlyCriticalSounds()  &&  !m_Param.m_bIsCriticalSound )
-		f *= 0;
 	return f;
 }
 
@@ -915,6 +913,8 @@ RageTimer RageSound::GetStartTime() const
 void RageSound::SetParams( const RageSoundParams &p )
 {
 	m_Param = p;
+	if( !m_Param.m_bIsCriticalSound && SOUNDMAN->GetPlayOnlyCriticalSounds() )
+		m_Param.m_Volume = 0;
 }
 
 RageSoundParams::StopMode_t RageSound::GetStopMode() const