diff --git a/include/gui/Surface.h b/include/gui/Surface.h
index a10dad1..451bd68 100644
--- a/include/gui/Surface.h
+++ b/include/gui/Surface.h
@@ -389,7 +389,8 @@
 
     Condition mQueueBufferCondition;
 
-    uint64_t mNextFrameNumber;
+    uint64_t mNextFrameNumber = 1;
+    uint64_t mLastFrameNumber = 0;
 
     // Mutable because ANativeWindow::query needs this class const.
     mutable bool mQueriedSupportedTimestamps;