diff --git a/stepmania/src/AutoKeysounds.cpp b/stepmania/src/AutoKeysounds.cpp
index 9d38efbd5a..18b93b94b2 100644
--- a/stepmania/src/AutoKeysounds.cpp
+++ b/stepmania/src/AutoKeysounds.cpp
@@ -21,6 +21,7 @@
 #include "song.h"
 #include "RageSoundReader_Chain.h"
 #include "RageSoundReader_PitchChange.h"
+#include "RageSoundReader_PostBuffering.h"
 #include "RageSoundManager.h"
 #include "RageLog.h"
 
@@ -135,6 +136,7 @@ void AutoKeysounds::FinishLoading()
 
 	/* Load a pitch shifter for the whole sound. */
 	pReader = new RageSoundReader_PitchChange( pReader );
+	pReader = new RageSoundReader_PostBuffering( pReader );
 
 	m_sSound.LoadSoundReader( pReader );
 }
diff --git a/stepmania/src/RageSound.cpp b/stepmania/src/RageSound.cpp
index 318e39da9c..1b96b62275 100644
--- a/stepmania/src/RageSound.cpp
+++ b/stepmania/src/RageSound.cpp
@@ -31,6 +31,7 @@
 #include "RageSoundReader_Extend.h"
 #include "RageSoundReader_Pan.h"
 #include "RageSoundReader_PitchChange.h"
+#include "RageSoundReader_PostBuffering.h"
 #include "RageSoundReader_Preload.h"
 #include "RageSoundReader_Resample_Good.h"
 #include "RageSoundReader_FileReader.h"
@@ -222,6 +223,7 @@ bool RageSound::Load( RString sSoundFilePath, bool bPrecache, const RageSoundLoa
 	m_pSource = new RageSoundReader_Extend( m_pSource );
 	if( !bPrecache )
 		m_pSource = new RageSoundReader_ThreadedBuffer( m_pSource );
+	m_pSource = new RageSoundReader_PostBuffering( m_pSource );
 
 	if( pParams->m_bSupportRateChanging )
 	{