diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index 456a7ae19d..d304fb9a61 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -477,7 +477,8 @@ void MusicWheel::BuildWheelItemDatas( CArray<WheelItemData, WheelItemData&> &arr
 		//		break;
 			case SORT_MOST_PLAYED:
 				SortSongPointerArrayByMostPlayed( arraySongs );
-				arraySongs.SetSize( 30 );
+				if( arraySongs.GetSize() > 30 )
+					arraySongs.SetSize( 30 );
 				break;
 			default:
 				ASSERT(0);	// unhandled SortOrder