diff --git a/app/audio/audiovisualwaveform.cpp b/app/audio/audiovisualwaveform.cpp
index 08c6c27b0..9cba6f755 100644
--- a/app/audio/audiovisualwaveform.cpp
+++ b/app/audio/audiovisualwaveform.cpp
@@ -37,6 +37,7 @@ void AudioVisualWaveform::OverwriteSamples(SampleBufferPtr samples, int sample_r
 {
   if (!channels_) {
     qWarning() << "Failed to write samples - channel count is zero";
+    return;
   }
 
   int start_index = time_to_samples(start);