diff --git a/src/ScreenSelectMusic.cpp b/src/ScreenSelectMusic.cpp
index d74ef75aa7..82f0784048 100644
--- a/src/ScreenSelectMusic.cpp
+++ b/src/ScreenSelectMusic.cpp
@@ -1894,11 +1894,23 @@ void ScreenSelectMusic::AfterMusicChange()
 	{
 		const Course *lCourse = m_MusicWheel.GetSelectedCourse();
 		const Style *pStyle = NULL;
-		if( CommonMetrics::AUTO_SET_STYLE )
-			pStyle = pCourse->GetCourseStyle( GAMESTATE->m_pCurGame, GAMESTATE->GetNumSidesJoined() );
-		if( pStyle == NULL )
+		if(CommonMetrics::AUTO_SET_STYLE)
+		{
+			pStyle = pCourse->GetCourseStyle(GAMESTATE->m_pCurGame, GAMESTATE->GetNumPlayersEnabled());
+			if(pStyle == NULL)
+			{
+				lCourse->GetAllTrails(m_vpTrails);
+			}
+			else
+			{
+				lCourse->GetTrails(m_vpTrails, pStyle->m_StepsType);
+			}
+		}
+		else
+		{
 			pStyle = GAMESTATE->GetCurrentStyle(PLAYER_INVALID);
-		lCourse->GetTrails( m_vpTrails, pStyle->m_StepsType );
+			lCourse->GetTrails(m_vpTrails, pStyle->m_StepsType);
+		}
 
 		m_sSampleMusicToPlay = m_sCourseMusicPath;
 		m_fSampleStartSeconds = 0;