diff --git a/src/cdrom/cdrom_mke.c b/src/cdrom/cdrom_mke.c
index 98ae6c057..9632c3140 100644
--- a/src/cdrom/cdrom_mke.c
+++ b/src/cdrom/cdrom_mke.c
@@ -1041,6 +1041,7 @@ static const device_config_t mke_config[] = {
             { .description = "320H", .value = 0x320 },
             { .description = "330H", .value = 0x330 },
             { .description = "340H", .value = 0x340 },
+            { .description = "630H", .value = 0x630 },
             { NULL                                  }
         },
         .bios           = { { 0 } }
diff --git a/src/sound/snd_azt2316a.c b/src/sound/snd_azt2316a.c
index 1f88db719..226adad15 100644
--- a/src/sound/snd_azt2316a.c
+++ b/src/sound/snd_azt2316a.c
@@ -1040,10 +1040,20 @@ azt2316a_enable_wss(uint8_t enable, void *priv)
 {
     azt2316a_t *azt2316a = (azt2316a_t *) priv;
 
-    if (enable)
+    sound_set_cd_audio_filter(NULL, NULL);
+
+    if (enable) {
         azt2316a->cur_mode = 1;
-    else
+        sound_set_cd_audio_filter(ad1848_filter_cd_audio, &azt2316a->ad1848);
+        azt2316a->sb->opl_mixer = azt2316a;
+        azt2316a->sb->opl_mix   = azt1605_filter_opl;
+    }
+    else {
         azt2316a->cur_mode = 0;
+        sound_set_cd_audio_filter(sbpro_filter_cd_audio, azt2316a->sb);
+        azt2316a->sb->opl_mixer = NULL;
+        azt2316a->sb->opl_mix   = NULL;
+    }
 }
 
 static void