diff --git a/repos/gems/src/app/trace_recorder/monitor.cc b/repos/gems/src/app/trace_recorder/monitor.cc
index c42e87a9de..2a1420369a 100644
--- a/repos/gems/src/app/trace_recorder/monitor.cc
+++ b/repos/gems/src/app/trace_recorder/monitor.cc
@@ -182,13 +182,13 @@ void Trace_recorder::Monitor::stop()
 			destroy(_alloc, &writer);
 		});
 
-		/* destroy buffer */
-		destroy(_alloc, &buf);
-
 		try {
 			/* detach buffer */
 			_trace.free(buf.subject_id());
 		} catch (Trace::Nonexistent_subject) { }
+
+		/* destroy buffer */
+		destroy(_alloc, &buf);
 	});
 
 	_trace_directory.destruct();