diff --git a/src/Player.cpp b/src/Player.cpp
index edda91a369..0f53324bdb 100644
--- a/src/Player.cpp
+++ b/src/Player.cpp
@@ -1136,7 +1136,7 @@ void Player::Update( float fDeltaTime )
 		 * .5 before the row. Use a very slow song (around 2 BPM) as a test case: without
 		 * rounding, autoplay steps early. -glenn */
 		const float fPositionSeconds = m_pPlayerState->m_Position.m_fMusicSeconds - PREFSMAN->m_fPadStickSeconds;
-		const float fSongBeat = GAMESTATE->m_pCurSong ? GAMESTATE->m_pCurSong->m_SongTiming.GetBeatFromElapsedTime( fPositionSeconds ) : 0;
+		const float fSongBeat = m_pPlayerState->GetDisplayedTiming().GetBeatFromElapsedTime( fPositionSeconds );
 		const int iRowNow = BeatToNoteRowNotRounded( fSongBeat );
 
 		if( iRowNow >= 0 )