diff --git a/src/engine/platform/ym2203.cpp b/src/engine/platform/ym2203.cpp
index 10fde1f29..057c98b76 100644
--- a/src/engine/platform/ym2203.cpp
+++ b/src/engine/platform/ym2203.cpp
@@ -1057,19 +1057,19 @@ void DivPlatformYM2203::setSkipRegisterWrites(bool value) {
 }
 
 void DivPlatformYM2203::setFlags(unsigned int flags) {
-  unsigned char ayFlags=32;
+  unsigned char ayFlags=16;
   if (flags==3) {
     chipClock=3000000.0;
-    ayFlags=36;
+    ayFlags=20;
   } else if (flags==2) {
     chipClock=4000000.0;
-    ayFlags=35;
+    ayFlags=19;
   } else if (flags==1) {
     chipClock=COLOR_PAL*4.0/5.0;
-    ayFlags=33;
+    ayFlags=17;
   } else {
     chipClock=COLOR_NTSC;
-    ayFlags=32;
+    ayFlags=16;
   }
   ay->setFlags(ayFlags);
   rate=fm->sample_rate(chipClock);
@@ -1090,7 +1090,7 @@ int DivPlatformYM2203::init(DivEngine* p, int channels, int sugRate, unsigned in
   fm->set_fidelity(ymfm::OPN_FIDELITY_MIN);
   // YM2149, 2MHz
   ay=new DivPlatformAY8910;
-  ay->init(p,3,sugRate,35);
+  ay->init(p,3,sugRate,19);
   ay->toggleRegisterDump(true);
   setFlags(flags);
 
diff --git a/src/engine/platform/ym2608.cpp b/src/engine/platform/ym2608.cpp
index b7e18e69d..730b62255 100644
--- a/src/engine/platform/ym2608.cpp
+++ b/src/engine/platform/ym2608.cpp
@@ -1459,7 +1459,7 @@ int DivPlatformYM2608::init(DivEngine* p, int channels, int sugRate, unsigned in
   }
   // YM2149, 2MHz
   ay=new DivPlatformAY8910;
-  ay->init(p,3,sugRate,35);
+  ay->init(p,3,sugRate,19);
   ay->toggleRegisterDump(true);
   reset();
   return 16;
diff --git a/src/engine/platform/ym2610.cpp b/src/engine/platform/ym2610.cpp
index ce3e4b7c1..f096f8f23 100644
--- a/src/engine/platform/ym2610.cpp
+++ b/src/engine/platform/ym2610.cpp
@@ -1454,7 +1454,7 @@ int DivPlatformYM2610::init(DivEngine* p, int channels, int sugRate, unsigned in
   fm=new ymfm::ym2610(iface);
   // YM2149, 2MHz
   ay=new DivPlatformAY8910;
-  ay->init(p,3,sugRate,35);
+  ay->init(p,3,sugRate,19);
   ay->toggleRegisterDump(true);
   reset();
   return 14;
diff --git a/src/engine/platform/ym2610b.cpp b/src/engine/platform/ym2610b.cpp
index 5a36aaaf4..c002f4b36 100644
--- a/src/engine/platform/ym2610b.cpp
+++ b/src/engine/platform/ym2610b.cpp
@@ -1432,7 +1432,7 @@ int DivPlatformYM2610B::init(DivEngine* p, int channels, int sugRate, unsigned i
   fm=new ymfm::ym2610b(iface);
   // YM2149, 2MHz
   ay=new DivPlatformAY8910;
-  ay->init(p,3,sugRate,35);
+  ay->init(p,3,sugRate,19);
   ay->toggleRegisterDump(true);
   reset();
   return 16;