diff --git a/os/android/iahwc2.cpp b/os/android/iahwc2.cpp
index 7babbe3c..98f2bc83 100644
--- a/os/android/iahwc2.cpp
+++ b/os/android/iahwc2.cpp
@@ -1238,6 +1238,10 @@ HWC2::Error IAHWC2::Hwc2Layer::SetLayerBuffer(buffer_handle_t buffer,
       sf_type_ == HWC2::Composition::Sideband)
     return HWC2::Error::None;
 
+  if (!(sf_type_ == HWC2::Composition::SolidColor || buffer)) {
+    return HWC2::Error::None;
+  }
+
   native_handle_.handle_ = buffer;
   hwc_layer_.SetNativeHandle(&native_handle_);