diff --git a/drm/VSyncWorker.cpp b/drm/VSyncWorker.cpp
index c120af6..6123e5c 100644
--- a/drm/VSyncWorker.cpp
+++ b/drm/VSyncWorker.cpp
@@ -78,6 +78,12 @@
   return last_vsync_timestamp_;
 }
 
+void VSyncWorker::SetTimestampCallback(
+    std::optional<VsyncTimestampCallback> &&callback) {
+  const std::lock_guard<std::mutex> lock(mutex_);
+  callback_ = std::move(callback);
+}
+
 void VSyncWorker::StopThread() {
   {
     const std::lock_guard<std::mutex> lock(mutex_);
@@ -173,6 +179,7 @@
     }
 
     decltype(callbacks_.out_event) callback;
+    std::optional<VsyncTimestampCallback> vsync_callback;
 
     {
       const std::lock_guard<std::mutex> lock(mutex_);
@@ -182,6 +189,11 @@
       if (enable_vsync_timestamps_) {
         last_vsync_timestamp_ = timestamp;
       }
+      vsync_callback = callback_;
+    }
+
+    if (vsync_callback) {
+      vsync_callback.value()(timestamp, vsync_period_ns_);
     }
 
     if (callback)