diff --git a/libhwcomposer/hwc.cpp b/libhwcomposer/hwc.cpp
index a46a172..a065834 100644
--- a/libhwcomposer/hwc.cpp
+++ b/libhwcomposer/hwc.cpp
@@ -81,9 +81,6 @@
     hwc_context_t* ctx = (hwc_context_t*)(dev);
     ctx->overlayInUse = false;
 
-    //Prepare is called after a vsync, so unlock previous buffers here.
-    ctx->qbuf->unlockAllPrevious();
-
     for (uint32_t i = 0; i <numDisplays; i++) {
         hwc_display_contents_1_t* list = displays[i];
         ctx->dpys[i] = list->dpy;
@@ -209,6 +206,7 @@
         if(!ctx->overlayInUse)
             ctx->mOverlay->setState(ovutils::OV_CLOSED);
     }
+    ctx->qbuf->unlockAllPrevious();
     return ret;
 }