diff --git a/src/jrd/trace/TraceManager.cpp b/src/jrd/trace/TraceManager.cpp
index 4854ab689b..a711dc09af 100644
--- a/src/jrd/trace/TraceManager.cpp
+++ b/src/jrd/trace/TraceManager.cpp
@@ -206,6 +206,11 @@ void TraceManager::update_sessions()
 			trace_sessions.remove(i);
 		}
 	}
+
+	// nothing to trace, clear needs
+	if (trace_sessions.getCount() == 0) {
+		memset(&trace_needs, 0, sizeof(trace_needs));
+	}
 }
 
 void TraceManager::update_session(const TraceSession& session)