diff --git a/stepmania/src/ScreenJukebox.cpp b/stepmania/src/ScreenJukebox.cpp
index 17c91f3657..8a5c69552d 100644
--- a/stepmania/src/ScreenJukebox.cpp
+++ b/stepmania/src/ScreenJukebox.cpp
@@ -19,7 +19,7 @@
 #include "SDL_utils.h"
 #include "ScreenManager.h"
 #include "RageSounds.h"
-
+#include "Steps.h"
 
 
 const ScreenMessage	SM_NotesEnded				= ScreenMessage(SM_User+10);	// MUST be same as in ScreenGameplay
@@ -61,6 +61,9 @@ bool ScreenJukebox::SetSong()
 		if( pNotes == NULL )
 			continue;	// skip
 
+		if( !PREFSMAN->m_bAutogenMissingTypes && pNotes->IsAutogen())
+			continue;	// skip
+
 		// Found something we can use!
 		GAMESTATE->m_pCurSong = pSong;
 		for( int p=0; p<NUM_PLAYERS; p++ )