diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp
index 00df087172..ca9a2e31c3 100644
--- a/stepmania/src/Course.cpp
+++ b/stepmania/src/Course.cpp
@@ -752,6 +752,16 @@ bool Course::HasMods() const
 	return false;
 }
 
+bool Course::AllSongsAreFixed() const
+{
+	for( int i=0; i<m_entries.size(); i++ )
+	{
+		if( m_entries[i].type != COURSE_ENTRY_FIXED )
+			return false;
+	}
+	return true;
+}
+
 void Course::ClearCache()
 {
 	m_InfoCache.clear();
diff --git a/stepmania/src/Course.h b/stepmania/src/Course.h
index e9aad5491e..4bc596ade6 100644
--- a/stepmania/src/Course.h
+++ b/stepmania/src/Course.h
@@ -116,6 +116,7 @@ public:
 	// Dereferences course_entries and returns only the playable Songs and Steps
 	void GetCourseInfo( StepsType nt, vector<Info> &ci, CourseDifficulty cd = COURSE_DIFFICULTY_REGULAR ) const;
 	bool HasMods() const;
+	bool AllSongsAreFixed() const;
 
 	int GetEstimatedNumStages() const { return m_entries.size(); }
 	bool HasCourseDifficulty( StepsType nt, CourseDifficulty cd ) const;
diff --git a/stepmania/src/Profile.cpp b/stepmania/src/Profile.cpp
index 000751a9ac..89fdf7efbb 100644
--- a/stepmania/src/Profile.cpp
+++ b/stepmania/src/Profile.cpp
@@ -228,6 +228,11 @@ int Profile::GetTotalHighScoreDancePointsForStepsType( StepsType st ) const
 		{
 			const Course* pCourse = iter->first;
 			ASSERT( pCourse );
+			
+			// Don't count any course that has any entries that change over time.
+			if( !pCourse->AllSongsAreFixed() )
+				continue;
+
 			const HighScoresForACourse& h = iter->second;
 			FOREACH_CourseDifficulty( cd )
 			{