diff --git a/app/node/output/viewer/viewer.cpp b/app/node/output/viewer/viewer.cpp
index 84627570f..c66525a45 100644
--- a/app/node/output/viewer/viewer.cpp
+++ b/app/node/output/viewer/viewer.cpp
@@ -235,7 +235,7 @@ void ViewerOutput::set_default_parameters()
 		OLIVE_CONFIG("DefaultSequencePixelAspect").value<rational>(),
 		OLIVE_CONFIG("DefaultSequenceInterlacing")
 			.value<VideoParams::Interlacing>(),
-		VideoParams::generate_auto_divider(width, height)));
+		1));
 	AVChannelLayout layout;
 	av_channel_layout_from_mask(
 		&layout, OLIVE_CONFIG("DefaultSequenceAudioLayout").toULongLong());
@@ -586,8 +586,7 @@ void ViewerOutput::set_parameters_from_footage(
 				static_cast<PixelFormat::Format>(
 					OLIVE_CONFIG("OfflinePixelFormat").toInt()),
 				VideoParams::kInternalChannelCount, s.pixel_aspect_ratio(),
-				s.interlacing(),
-				VideoParams::generate_auto_divider(s.width(), s.height())));
+				s.interlacing(), 1));
 
 			if (found_video_params) {
 				break;
diff --git a/app/widget/viewer/audiowaveformview.cpp b/app/widget/viewer/audiowaveformview.cpp
index cac2a5713..5b9331c70 100644
--- a/app/widget/viewer/audiowaveformview.cpp
+++ b/app/widget/viewer/audiowaveformview.cpp
@@ -67,7 +67,11 @@ void AudioWaveformView::SetViewer(ViewerOutput *playback)
 		connect(playback_, &ViewerOutput::ConnectedWaveformChanged, viewport(),
 				static_cast<void (QWidget::*)()>(&QWidget::update));
 
-		SetTimebase(playback_->GetAudioParams().sample_rate_as_time_base());
+		SetTimebase(playback_->GetVideoParams().frame_rate_as_time_base());
+		if (timebase().isNull()) {
+			SetTimebase(
+				playback_->GetAudioParams().sample_rate_as_time_base());
+		}
 	}
 }