diff --git a/CHANGES b/CHANGES
index e6b9cf351..6f0f13670 100644
--- a/CHANGES
+++ b/CHANGES
@@ -22,6 +22,7 @@ Emulation fixes:
  - GB Audio: Fix channel 1/2 reseting edge cases (fixes mgba.io/i/1925)
  - GB Audio: Properly apply per-model audio differences
  - GB Audio: Revamp channel rendering
+ - GB Audio: Fix APU re-enable timing glitch
  - GB Memory: Add cursory cartridge open bus emulation (fixes mgba.io/i/2032)
  - GB Serialize: Fix loading MBC1 states that affect bank 0 (fixes mgba.io/i/2402)
  - GB Video: Draw SGB border pieces that overlap GB graphics (fixes mgba.io/i/1339)
diff --git a/cinema/gb/blargg/cgb_sound/07-len sweep period sync/baseline_0000.png b/cinema/gb/blargg/cgb_sound/07-len sweep period sync/baseline_0000.png
new file mode 100644
index 000000000..c5a976f9b
Binary files /dev/null and b/cinema/gb/blargg/cgb_sound/07-len sweep period sync/baseline_0000.png differ
diff --git a/cinema/gb/blargg/cgb_sound/07-len sweep period sync/config.ini b/cinema/gb/blargg/cgb_sound/07-len sweep period sync/config.ini
deleted file mode 100644
index 7ddee425b..000000000
--- a/cinema/gb/blargg/cgb_sound/07-len sweep period sync/config.ini	
+++ /dev/null
@@ -1,2 +0,0 @@
-[testinfo]
-fail=1
diff --git a/cinema/gb/blargg/cgb_sound/07-len sweep period sync/xbaseline_0000.png b/cinema/gb/blargg/cgb_sound/07-len sweep period sync/xbaseline_0000.png
deleted file mode 100644
index ae283b3b6..000000000
Binary files a/cinema/gb/blargg/cgb_sound/07-len sweep period sync/xbaseline_0000.png and /dev/null differ
diff --git a/cinema/gb/blargg/cgb_sound/08-len ctr during power/baseline_0000.png b/cinema/gb/blargg/cgb_sound/08-len ctr during power/baseline_0000.png
new file mode 100644
index 000000000..ac38f491b
Binary files /dev/null and b/cinema/gb/blargg/cgb_sound/08-len ctr during power/baseline_0000.png differ
diff --git a/cinema/gb/blargg/cgb_sound/08-len ctr during power/config.ini b/cinema/gb/blargg/cgb_sound/08-len ctr during power/config.ini
deleted file mode 100644
index 7ddee425b..000000000
--- a/cinema/gb/blargg/cgb_sound/08-len ctr during power/config.ini	
+++ /dev/null
@@ -1,2 +0,0 @@
-[testinfo]
-fail=1
diff --git a/cinema/gb/blargg/cgb_sound/08-len ctr during power/xbaseline_0000.png b/cinema/gb/blargg/cgb_sound/08-len ctr during power/xbaseline_0000.png
deleted file mode 100644
index 4dbe59509..000000000
Binary files a/cinema/gb/blargg/cgb_sound/08-len ctr during power/xbaseline_0000.png and /dev/null differ
diff --git a/cinema/gb/blargg/dmg_sound/07-len sweep period sync/baseline_0000.png b/cinema/gb/blargg/dmg_sound/07-len sweep period sync/baseline_0000.png
new file mode 100644
index 000000000..c5a976f9b
Binary files /dev/null and b/cinema/gb/blargg/dmg_sound/07-len sweep period sync/baseline_0000.png differ
diff --git a/cinema/gb/blargg/dmg_sound/07-len sweep period sync/config.ini b/cinema/gb/blargg/dmg_sound/07-len sweep period sync/config.ini
deleted file mode 100644
index 7ddee425b..000000000
--- a/cinema/gb/blargg/dmg_sound/07-len sweep period sync/config.ini	
+++ /dev/null
@@ -1,2 +0,0 @@
-[testinfo]
-fail=1
diff --git a/cinema/gb/blargg/dmg_sound/07-len sweep period sync/xbaseline_0000.png b/cinema/gb/blargg/dmg_sound/07-len sweep period sync/xbaseline_0000.png
deleted file mode 100644
index ae283b3b6..000000000
Binary files a/cinema/gb/blargg/dmg_sound/07-len sweep period sync/xbaseline_0000.png and /dev/null differ
diff --git a/cinema/gb/blargg/dmg_sound/08-len ctr during power/baseline_0000.png b/cinema/gb/blargg/dmg_sound/08-len ctr during power/baseline_0000.png
new file mode 100644
index 000000000..034aeec3c
Binary files /dev/null and b/cinema/gb/blargg/dmg_sound/08-len ctr during power/baseline_0000.png differ
diff --git a/cinema/gb/blargg/dmg_sound/08-len ctr during power/config.ini b/cinema/gb/blargg/dmg_sound/08-len ctr during power/config.ini
deleted file mode 100644
index 7ddee425b..000000000
--- a/cinema/gb/blargg/dmg_sound/08-len ctr during power/config.ini	
+++ /dev/null
@@ -1,2 +0,0 @@
-[testinfo]
-fail=1
diff --git a/cinema/gb/blargg/dmg_sound/08-len ctr during power/xbaseline_0000.png b/cinema/gb/blargg/dmg_sound/08-len ctr during power/xbaseline_0000.png
deleted file mode 100644
index 588e334ea..000000000
Binary files a/cinema/gb/blargg/dmg_sound/08-len ctr during power/xbaseline_0000.png and /dev/null differ
diff --git a/src/gb/audio.c b/src/gb/audio.c
index 19f265c47..47911f794 100644
--- a/src/gb/audio.c
+++ b/src/gb/audio.c
@@ -451,7 +451,7 @@ void GBAudioWriteNR52(struct GBAudio* audio, uint8_t value) {
 		audio->skipFrame = false;
 		audio->frame = 7;
 
-		if (audio->p && audio->p->timer.internalDiv & 0x400) {
+		if (audio->p && audio->p->timer.internalDiv & (0x100 << audio->p->doubleSpeed)) {
 			audio->skipFrame = true;
 		}
 	}