diff --git a/src/libcamera/base/thread.cpp b/src/libcamera/base/thread.cpp
index 6bda9d14..2e26b83c 100644
--- a/src/libcamera/base/thread.cpp
+++ b/src/libcamera/base/thread.cpp
@@ -151,7 +151,7 @@ private:
 	friend class ThreadMain;
 
 	Thread *thread_;
-	bool running_;
+	bool running_ LIBCAMERA_TSA_GUARDED_BY(mutex_);
 	pid_t tid_;
 
 	Mutex mutex_;
@@ -160,7 +160,7 @@ private:
 
 	ConditionVariable cv_;
 	std::atomic<bool> exit_;
-	int exitCode_;
+	int exitCode_ LIBCAMERA_TSA_GUARDED_BY(mutex_);
 
 	MessageQueue messages_;
 };
@@ -422,11 +422,19 @@ bool Thread::wait(utils::duration duration)
 	{
 		MutexLocker locker(data_->mutex_);
 
-		if (duration == utils::duration::max())
-			data_->cv_.wait(locker, [&]() { return !data_->running_; });
-		else
-			hasFinished = data_->cv_.wait_for(locker, duration,
-							  [&]() { return !data_->running_; });
+		if (duration == utils::duration::max()) {
+			data_->cv_.wait(
+				locker,
+				[&]() LIBCAMERA_TSA_REQUIRES(data_->mutex_) {
+					return !data_->running_;
+				});
+		} else {
+			hasFinished = data_->cv_.wait_for(
+				locker, duration,
+				[&]() LIBCAMERA_TSA_REQUIRES(data_->mutex_) {
+					return !data_->running_;
+				});
+		}
 	}
 
 	if (thread_.joinable())