diff --git a/src/emucore/OSystem.cxx b/src/emucore/OSystem.cxx
index 497ebb8e0..611439e45 100644
--- a/src/emucore/OSystem.cxx
+++ b/src/emucore/OSystem.cxx
@@ -193,9 +193,10 @@ bool OSystem::create()
   // Detect serial port for AtariVox-USB
   // If a previously set port is defined, use it;
   // otherwise use the first one found (if any)
-  StringList ports = MediaFactory::createSerialPort()->portNames();
-  bool oldPortFound = BSPF::contains(ports, mySettings->getString("avoxport"));
-  if(!oldPortFound && ports.size() > 0)
+  const string& avoxport = mySettings->getString("avoxport");
+  const StringList ports = MediaFactory::createSerialPort()->portNames();
+
+  if(avoxport.empty() && ports.size() > 0)
     mySettings->setValue("avoxport", ports[0]);
 
   return true;