diff --git a/libs/ardour/export_graph_builder.cc b/libs/ardour/export_graph_builder.cc
index 75587dedae..9e25d51513 100644
--- a/libs/ardour/export_graph_builder.cc
+++ b/libs/ardour/export_graph_builder.cc
@@ -307,8 +307,12 @@ ExportGraphBuilder::SFC::SFC (ExportGraphBuilder &parent, FileSpec const & new_c
 	unsigned channels = new_config.channel_config->get_n_chans();
 	_analyse = config.format->analyse();
 	if (_analyse) {
+		framecnt_t sample_rate = parent.session.nominal_frame_rate();
+		framecnt_t sb = config.format->silence_beginning_at (parent.timespan->get_start(), sample_rate);
+		framecnt_t se = config.format->silence_end_at (parent.timespan->get_end(), sample_rate);
+		framecnt_t duration = parent.timespan->get_length () + sb + se;
 		analyser.reset (new Analyser (config.format->sample_rate(), channels, max_frames,
-					(framecnt_t) ceil (parent.timespan->get_length () * config.format->sample_rate () / (double) parent.session.nominal_frame_rate ())));
+					(framecnt_t) ceil (duration * config.format->sample_rate () / sample_rate)));
 		parent.add_analyser (config.filename->get_path (config.format), analyser);
 	}
 
diff --git a/libs/audiographer/src/general/analyser.cc b/libs/audiographer/src/general/analyser.cc
index d0c58f037f..d216267fbd 100644
--- a/libs/audiographer/src/general/analyser.cc
+++ b/libs/audiographer/src/general/analyser.cc
@@ -234,8 +234,8 @@ Analyser::process (ProcessContext<float> const & ctx)
 ARDOUR::ExportAnalysisPtr
 Analyser::result ()
 {
-	if (_pos == 0) {
 	DEBUG_TRACE (PBD::DEBUG::ExportAnalysis, string_compose ("Processed %1 / %2 samples", _pos, _n_samples));
+	if (_pos == 0 || _pos != _n_samples) {
 		return ARDOUR::ExportAnalysisPtr ();
 	}
 	if (_ebur128_plugin) {