diff --git a/system/camerad/cameras/camera_common.cc b/system/camerad/cameras/camera_common.cc
index 28204d711..f63a48b73 100644
--- a/system/camerad/cameras/camera_common.cc
+++ b/system/camerad/cameras/camera_common.cc
@@ -57,7 +57,9 @@ bool CameraBuf::acquire() {
   }
 
   cur_frame_data = frame_metadata[cur_buf_idx];
-  cur_camera_buf = &camera_bufs_raw[cur_buf_idx];
+  if (camera_bufs_raw) {
+    cur_camera_buf = &camera_bufs_raw[cur_buf_idx];
+  }
 
   cur_yuv_buf = vipc_server->get_buffer(stream_type, cur_buf_idx);
   cur_frame_data.processing_time = (double)(cur_frame_data.timestamp_end_of_isp - cur_frame_data.timestamp_eof)*1e-9;