diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index e5c50084e590..538b8ab5da03 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -1033,9 +1033,18 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)
 FrameBuffer *CameraDevice::createFrameBuffer(const buffer_handle_t camera3buffer)
 {
 	std::vector<FrameBuffer::Plane> planes;
-	for (unsigned int i = 0; i < 3; i++) {
+	for (int i = 0; i < camera3buffer->numFds; i++) {
 		FrameBuffer::Plane plane;
 		plane.fd = FileDescriptor(camera3buffer->data[i]);
+
+		/* numFds is seemingly always 4... */
+		if (!plane.fd.isValid()) {
+			LOG(HAL, Debug) << "Created an invalid plane... ("
+					<< camera3buffer->data[i] << ") "
+					<< i << "/" << camera3buffer->numFds;
+			continue;
+		}
+
 		/*
 		 * Setting length to zero here is OK as the length is only used
 		 * to map the memory of the plane. Libcamera do not need to poke