diff --git a/source/list/cachedlist.cpp b/source/list/cachedlist.cpp
index 517ef6f3..8e8fe832 100644
--- a/source/list/cachedlist.cpp
+++ b/source/list/cachedlist.cpp
@@ -50,11 +50,10 @@ void CachedList<T>::Load(string path, string containing, string m_lastLanguage,
 		if(update_lang) gprintf("Languages are different!\nOld language string: %s\nNew language string: %s\n", m_lastLanguage.c_str(), m_curLanguage.c_str());
 		if(noDB) gprintf("A database was not found!\n");
 		if(mtimes || ditimes) gprintf("The WBFS folder was modified!\nCache date: %i\nFolder date: %i\n", cache.st_mtime, filestat.st_mtime);
-	
-		if(m_extcheck && !m_update)
+
+		if(m_extcheck && !m_update && strcasestr(path.c_str(), "wbfs") != NULL)
 		{
 			bool m_chupdate = false;
-	
 			DIR *dir = opendir(path.c_str());
 			struct dirent *entry;
 			while((entry = readdir(dir)) != NULL)
@@ -62,7 +61,6 @@ void CachedList<T>::Load(string path, string containing, string m_lastLanguage,
 				m_discinf = sfmt("%s/%s", path.c_str(), entry->d_name);
 				if(stat(m_discinf.c_str(), &discinfo) != -1)
 					m_chupdate = discinfo.st_mtime > cache.st_mtime;
-			
 				if(m_chupdate)
 					break;
 			}
diff --git a/source/menu/menu.cpp b/source/menu/menu.cpp
index 97526fd5..2a1d6ccf 100644
--- a/source/menu/menu.cpp
+++ b/source/menu/menu.cpp
@@ -392,7 +392,7 @@ void CMenu::init(void)
 		m_loc.load(fmt("%s/%s.ini", m_languagesDir.c_str(), m_curLanguage.c_str()));
 	}
 	
-	bool extcheck = m_cfg.getBool("GENERAL", "extended_list_check", true);
+	bool extcheck = m_cfg.getBool("GENERAL", "extended_list_check", false);
 	
 	m_gameList.Init(m_listCacheDir, m_settingsDir, m_loc.getString(m_curLanguage, "gametdb_code", "EN"), m_DMLgameDir, extcheck);