diff --git a/src/AudioIO.cpp b/src/AudioIO.cpp
index 46e2e4083..5adf26872 100644
--- a/src/AudioIO.cpp
+++ b/src/AudioIO.cpp
@@ -2404,11 +2404,13 @@ void AudioIO::SetPlaybackMeter(AudacityProject *project, MeterPanel *meter)
    if (( mOwningProject ) && ( mOwningProject != project))
       return;
 
-   mOutputMeter = meter;
-   if (mOutputMeter)
+   if (meter)
    {
+      mOutputMeter = meter;
       mOutputMeter->Reset(mRate, true);
    }
+   else
+      mOutputMeter.Release();
 }
 
 void AudioIO::SetMeters()