diff --git a/src/core/spu.cpp b/src/core/spu.cpp
index 0caf6d4af..ddb66b937 100644
--- a/src/core/spu.cpp
+++ b/src/core/spu.cpp
@@ -450,9 +450,9 @@ void SPU::CPUClockChanged()
 
 void SPU::Shutdown()
 {
+  StopDumpingAudio();
   s_tick_event.reset();
   s_transfer_event.reset();
-  s_dump_writer.reset();
   s_audio_stream.reset();
 }
 
diff --git a/src/core/system.cpp b/src/core/system.cpp
index 2ef782cd5..059e4e50c 100644
--- a/src/core/system.cpp
+++ b/src/core/system.cpp
@@ -1273,6 +1273,9 @@ bool System::BootSystem(SystemBootParameters parameters)
   if (parameters.load_image_to_ram || g_settings.cdrom_load_image_to_ram)
     g_cdrom.PrecacheMedia();
 
+  if (g_settings.audio_dump_on_boot)
+    StartDumpingAudio();
+
   ResetPerformanceCounters();
   if (IsRunning())
     UpdateSpeedLimiterState();