diff --git a/hwc3/ComposerClient.cpp b/hwc3/ComposerClient.cpp
index 5da2c19..4dafb48 100644
--- a/hwc3/ComposerClient.cpp
+++ b/hwc3/ComposerClient.cpp
@@ -408,17 +408,15 @@
 
     auto bi = ::android::BufferInfoGetter::GetInstance()->GetBoInfo(
         hwc3->GetHandle());
-    if (!bi) {
-      return std::nullopt;
+    if (bi) {
+      bi->fds_shared = hwc3;
+
+      lp.slot_buffer = {
+          .slot_id = slot_id,
+          .bi = bi,
+      };
     }
 
-    bi->fds_shared = hwc3;
-
-    lp.slot_buffer = {
-        .slot_id = slot_id,
-        .bi = bi,
-    };
-
     lp.active_slot = {
         .slot_id = slot_id,
         .fence = std::move(fence_fd),