diff --git a/stepmania/src/ProfileHtml.cpp b/stepmania/src/ProfileHtml.cpp
index c0234d5092..b75949d596 100644
--- a/stepmania/src/ProfileHtml.cpp
+++ b/stepmania/src/ProfileHtml.cpp
@@ -23,6 +23,7 @@
 #include "Bookkeeper.h"
 #include "PrefsManager.h"
 #include "CryptManager.h"
+#include "UnlockSystem.h"
 #include "RageUtil.h"
 
 
@@ -609,6 +610,8 @@ void PrintHighScoreListTable( RageFile &f, const HighScoreList& hsl )
 
 bool PrintHighScoresForSong( RageFile &f, const Profile *pProfile, Song* pSong )
 {
+	if( pSong->m_SelectionDisplay == Song::SHOW_NEVER || UNLOCKMAN->SongIsLocked(pSong) )
+		return false;	// skip
 	int iNumTimesPlayed = pProfile->GetSongNumTimesPlayed(pSong);
 	if( iNumTimesPlayed == 0 )
 		return false;	// skip
@@ -754,6 +757,9 @@ void PrintGradeTable( RageFile &f, const Profile *pProfile, CString sTitle, vect
 
 bool PrintInventoryForSong( RageFile &f, const Profile *pProfile, Song* pSong )
 {
+	if( pSong->m_SelectionDisplay == Song::SHOW_NEVER || UNLOCKMAN->SongIsLocked(pSong) )
+		return false;	// skip
+
 	vector<Steps*> vpSteps = pSong->GetAllSteps();
 
 	PRINT_OPEN(f, pSong->GetFullDisplayTitle().c_str() );