diff --git a/CHANGES b/CHANGES
index bfeefbfad..835db7c64 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@ Emulation fixes:
  - ARM: Fix Addressing mode 1 shifter on rs == pc (fixes mgba.io/i/1926)
 Other fixes:
  - CMake: Fix build with downstream minizip that exports incompatible symbols
+ - Debugger: Close trace log when done tracing
 
 0.8.4: (2020-10-29)
 Emulation fixes:
diff --git a/src/debugger/cli-debugger.c b/src/debugger/cli-debugger.c
index ad125e04c..11b0edcff 100644
--- a/src/debugger/cli-debugger.c
+++ b/src/debugger/cli-debugger.c
@@ -723,7 +723,12 @@ static bool _doTrace(struct CLIDebugger* debugger) {
 	if (debugger->traceRemaining > 0) {
 		--debugger->traceRemaining;
 	}
-	return debugger->traceRemaining != 0;
+	if (!debugger->traceRemaining) {
+		debugger->traceVf->close(debugger->traceVf);
+		debugger->traceVf = NULL;
+		return false;
+	}
+	return true;
 }
 
 static void _printStatus(struct CLIDebugger* debugger, struct CLIDebugVector* dv) {