diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index 9fb12116d3..81ad869523 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -783,11 +783,14 @@ void ReadGamePrefsFromDisk( bool bSwitchToLastPlayedGame )
 	}
 
 	/* If the active game type isn't actually available, revert to the default. */
-	if( GAMESTATE->m_pCurGame == NULL || !GAMEMAN->IsGameEnabled( GAMESTATE->m_pCurGame ) )
+	if( GAMESTATE->m_pCurGame == NULL )
 	{
-		if( GAMESTATE->m_pCurGame != NULL )
-			LOG->Warn( "Default NoteSkin for \"%s\" missing, reverting to \"%s\"",
-				GAMESTATE->m_pCurGame->m_szName, GAMEMAN->GetDefaultGame()->m_szName );
+		GAMESTATE->m_pCurGame = GAMEMAN->GetDefaultGame();
+	}
+	else if( !GAMEMAN->IsGameEnabled( GAMESTATE->m_pCurGame )  &&  GAMESTATE->m_pCurGame != GAMEMAN->GetDefaultGame() )
+	{
+		LOG->Warn( "Default NoteSkin for \"%s\" missing, reverting to \"%s\"",
+			GAMESTATE->m_pCurGame->m_szName, GAMEMAN->GetDefaultGame()->m_szName );
 		GAMESTATE->m_pCurGame = GAMEMAN->GetDefaultGame();
 	}