diff --git a/src/apu/Gb_Oscs.cpp b/src/apu/Gb_Oscs.cpp
index bba510b5..72ec8049 100644
--- a/src/apu/Gb_Oscs.cpp
+++ b/src/apu/Gb_Oscs.cpp
@@ -113,10 +113,10 @@ void Gb_Sweep_Square::clock_sweep()
 
 int Gb_Wave::access( unsigned addr ) const
 {
-	if ( enabled )
+	if ( enabled && mode != Gb_Apu::mode_agb )
 	{
 		addr = phase & (bank_size - 1);
-		if ( mode == Gb_Apu::mode_agb )
+		if ( mode == Gb_Apu::mode_dmg )
 		{
 			addr++;
 			if ( delay > clk_mul )