diff --git a/libs/ardour/disk_writer.cc b/libs/ardour/disk_writer.cc
index 738aea6477..aee4f9301e 100644
--- a/libs/ardour/disk_writer.cc
+++ b/libs/ardour/disk_writer.cc
@@ -1125,7 +1125,7 @@ DiskWriter::transport_stopped_wallclock (struct tm& when, time_t twhen, bool abo
 		if (as) {
 			audio_srcs.push_back (as);
 			as->update_header (capture_info.front()->start, when, twhen);
-			as->set_captured_for (_name.val());
+			as->set_captured_for (_track->name());
 			as->mark_immutable ();
 
 			Glib::DateTime tm (Glib::DateTime::create_now_local (mktime (&when)));
@@ -1140,6 +1140,7 @@ DiskWriter::transport_stopped_wallclock (struct tm& when, time_t twhen, bool abo
 
 		if (_midi_write_source) {
 			midi_srcs.push_back (_midi_write_source);
+			_midi_write_source->set_captured_for (_track->name());
 		}
 
 		(*chan)->write_source->stamp (twhen);
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 3436d36bde..07808370e5 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -5757,6 +5757,8 @@ Session::write_one_track (Track& track, samplepos_t start, samplepos_t end,
 			goto out;
 		}
 
+		source->set_captured_for(track.name());
+
 		srcs.push_back (source);
 	}