diff --git a/app/widget/viewer/audiowaveformview.cpp b/app/widget/viewer/audiowaveformview.cpp
index 5b9331c70..f3bb2a08a 100644
--- a/app/widget/viewer/audiowaveformview.cpp
+++ b/app/widget/viewer/audiowaveformview.cpp
@@ -67,11 +67,12 @@ void AudioWaveformView::SetViewer(ViewerOutput *playback)
 		connect(playback_, &ViewerOutput::ConnectedWaveformChanged, viewport(),
 				static_cast<void (QWidget::*)()>(&QWidget::update));
 
-		SetTimebase(playback_->GetVideoParams().frame_rate_as_time_base());
-		if (timebase().isNull()) {
-			SetTimebase(
-				playback_->GetAudioParams().sample_rate_as_time_base());
+		rational tb = playback_->GetVideoParams().frame_rate_as_time_base();
+		if (tb.isNull()) {
+			tb = OLIVE_CONFIG("DefaultSequenceFrameRate").value<rational>().flipped();
 		}
+		SetTimebase(tb);
+		UpdateSceneRect();
 	}
 }
 
diff --git a/app/widget/viewer/viewer.cpp b/app/widget/viewer/viewer.cpp
index ce174501c..a3bb443c9 100644
--- a/app/widget/viewer/viewer.cpp
+++ b/app/widget/viewer/viewer.cpp
@@ -826,6 +826,12 @@ void ViewerWidget::UpdateWaveformViewFromMode()
 
 	if (GetConnectedNode()) {
 		GetConnectedNode()->SetWaveformEnabled(waveform_view_->isVisible());
+
+		if (waveform_view_->isVisible()) {
+			waveform_view_->SetViewer(GetConnectedNode());
+		} else {
+			waveform_view_->SetViewer(nullptr);
+		}
 	}
 }