diff --git a/src/emucore/Console.cxx b/src/emucore/Console.cxx
index a5372e281..f52bd41ad 100644
--- a/src/emucore/Console.cxx
+++ b/src/emucore/Console.cxx
@@ -545,10 +545,10 @@ void Console::changeHeight(int direction)
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 AbstractTIA* Console::createTIA()
 {
-  string coreType = "default";
-
 #ifdef SUPPORT_6502TS_TIA
-  coreType = myOSystem.settings().getString("tia.core");
+  string coreType = myOSystem.settings().getString("tia.core");
+#else
+  string coreType = "default";
 #endif
 
   if (coreType == "default") {
diff --git a/src/emucore/Settings.cxx b/src/emucore/Settings.cxx
index 94da3ef40..8dbb86db4 100644
--- a/src/emucore/Settings.cxx
+++ b/src/emucore/Settings.cxx
@@ -49,7 +49,7 @@ Settings::Settings(OSystem& osystem)
 
   // TIA specific options
 #ifdef SUPPORT_6502TS_TIA
-  setInternal("tia.core", "default");
+  setInternal("tia.core", "6502ts");
 #endif
   setInternal("tia.zoom", "2");
   setInternal("tia.inter", "false");
@@ -330,7 +330,7 @@ void Settings::validate()
 
 #ifdef SUPPORT_6502TS_TIA
   s = getString("tia.core");
-  if (s != "6502ts" && s != "default") setInternal("tia.core", "default");
+  if (s != "6502ts" && s != "default") setInternal("tia.core", "6502ts");
 #endif
 
 }