diff --git a/libs/gui/BufferQueue.cpp b/libs/gui/BufferQueue.cpp
index 607e0bdbe..086e29819 100644
--- a/libs/gui/BufferQueue.cpp
+++ b/libs/gui/BufferQueue.cpp
@@ -314,12 +314,9 @@ status_t BufferQueue::dequeueBuffer(int *outBuf, sp<Fence>& outFence,
                      * the consumer may still have pending reads of the
                      * buffers in flight.
                      */
-                    if (found >= 0) {
-                        bool isOlder = mSlots[i].mFrameNumber <
-                                mSlots[found].mFrameNumber;
-                        if (isOlder) {
-                            found = i;
-                        }
+                    if ((found < 0) ||
+                            mSlots[i].mFrameNumber < mSlots[found].mFrameNumber) {
+                        found = i;
                     }
                 }
             }