diff --git a/libhwcomposer/hwcomposer.cpp b/libhwcomposer/hwcomposer.cpp
index 8f6f037..d4d133f 100644
--- a/libhwcomposer/hwcomposer.cpp
+++ b/libhwcomposer/hwcomposer.cpp
@@ -1646,9 +1646,11 @@ static int hwc_set(hwc_composer_device_t *dev,
         ctx->nPipesUsed = 0;
 #endif
         ctx->hwcOverlayStatus =  HWC_OVERLAY_PREPARE_TO_CLOSE;
+        unlockPreviousOverlayBuffer(ctx);
     }
     
 
+
     bool canSkipComposition = list && list->flags & HWC_SKIP_COMPOSITION;
 #ifdef COMPOSITION_BYPASS
     unlockPreviousBypassBuffers(ctx);