diff --git a/src/engine/platform/sound/gb/apu.c b/src/engine/platform/sound/gb/apu.c
index 4c473997..8836ddd2 100644
--- a/src/engine/platform/sound/gb/apu.c
+++ b/src/engine/platform/sound/gb/apu.c
@@ -1180,11 +1180,11 @@ void GB_apu_write(GB_gameboy_t *gb, uint8_t reg, uint8_t value)
             if ((value & 0x80)) {
                 /* DMG bug: wave RAM gets corrupted if the channel is retriggerred 1 cycle before the APU
                             reads from it. */
-                /*if (!CGB &&
+                if (!CGB &&
                     gb->apu.is_active[GB_WAVE] &&
                     gb->apu.wave_channel.sample_countdown == 0 &&
                     gb->apu.wave_channel.enable) {
-                    unsigned offset = ((gb->apu.wave_channel.current_sample_index + 1) >> 1) & 0xF;*/
+                    unsigned offset = ((gb->apu.wave_channel.current_sample_index + 1) >> 1) & 0xF;
 
                     /* This glitch varies between models and even specific instances:
                        DMG-B:     Most of them behave as emulated. A few behave differently.
@@ -1193,7 +1193,7 @@ void GB_apu_write(GB_gameboy_t *gb, uint8_t reg, uint8_t value)
 
                       Additionally, I believe DMGs, including those we behave differently than emulated,
                       are all deterministic. */
-                    /*if (offset < 4) {
+                    if (offset < 4) {
                         gb->io_registers[GB_IO_WAV_START] = gb->io_registers[GB_IO_WAV_START + offset];
                         gb->apu.wave_channel.wave_form[0] = gb->apu.wave_channel.wave_form[offset / 2];
                         gb->apu.wave_channel.wave_form[1] = gb->apu.wave_channel.wave_form[offset / 2 + 1];
@@ -1206,7 +1206,7 @@ void GB_apu_write(GB_gameboy_t *gb, uint8_t reg, uint8_t value)
                                gb->apu.wave_channel.wave_form + (offset & ~3) * 2,
                                8);
                     }
-                }*/
+                }
                 if (!gb->apu.is_active[GB_WAVE]) {
                     gb->apu.is_active[GB_WAVE] = true;
                     update_sample(gb, GB_WAVE,
diff --git a/src/engine/platform/sound/gb/gb.h b/src/engine/platform/sound/gb/gb.h
index ac817395..ca365085 100644
--- a/src/engine/platform/sound/gb/gb.h
+++ b/src/engine/platform/sound/gb/gb.h
@@ -16,7 +16,7 @@ extern "C" {
 
 #define GB_STRUCT_VERSION 13
 
-#define CGB 0
+#define CGB (gb->model&GB_MODEL_CGB_FAMILY)
 
 #define GB_MODEL_FAMILY_MASK 0xF00
 #define GB_MODEL_DMG_FAMILY 0x000