diff --git a/src/engine/platform/ay.cpp b/src/engine/platform/ay.cpp
index a15d04f27..f50234087 100644
--- a/src/engine/platform/ay.cpp
+++ b/src/engine/platform/ay.cpp
@@ -818,7 +818,6 @@ void DivPlatformAY8910::setFlags(const DivConfig& flags) {
     clockSel=false;
     dacRate=chipClock/dacRateDiv;
   } else {
-    clockSel=flags.getBool("halfClock",false);
     switch (flags.getInt("clockSel",0)) {
       case 1:
         chipClock=COLOR_PAL*2.0/5.0;
@@ -883,21 +882,25 @@ void DivPlatformAY8910::setFlags(const DivConfig& flags) {
       ay=new ym2149_device(rate,clockSel);
       sunsoft=false;
       intellivision=false;
+      clockSel=flags.getBool("halfClock",false);
       break;
     case 2:
       ay=new sunsoft_5b_sound_device(rate);
       sunsoft=true;
       intellivision=false;
+      clockSel=false;
       break;
     case 3:
       ay=new ay8914_device(rate);
       sunsoft=false;
       intellivision=true;
+      clockSel=false;
       break;
     default:
       ay=new ay8910_device(rate);
       sunsoft=false;
       intellivision=false;
+      clockSel=false;
       break;
   }
   ay->device_start();