diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index 113c26ca3..dca27baa2 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -546,6 +546,7 @@ public:
         getLayer()->compositionType = HWC_FRAMEBUFFER;
         getLayer()->hints = 0;
         getLayer()->flags = HWC_SKIP_LAYER;
+        getLayer()->handle = 0;
         getLayer()->transform = 0;
         getLayer()->blending = HWC_BLENDING_NONE;
         getLayer()->visibleRegionScreen.numRects = 0;
diff --git a/services/surfaceflinger/LayerBase.cpp b/services/surfaceflinger/LayerBase.cpp
index 87dc572aa..311d95fce 100644
--- a/services/surfaceflinger/LayerBase.cpp
+++ b/services/surfaceflinger/LayerBase.cpp
@@ -292,7 +292,6 @@ void LayerBase::setGeometry(
 
 void LayerBase::setPerFrameData(const sp<const DisplayDevice>& hw,
         HWComposer::HWCLayerInterface& layer) {
-    layer.setBuffer(0);
     // we have to set the visible region on every frame because
     // we currently free it during onLayerDisplayed(), which is called
     // after HWComposer::commit() -- every frame.