diff --git a/msm8998/QCamera2/HAL3/QCamera3Channel.cpp b/msm8998/QCamera2/HAL3/QCamera3Channel.cpp
index 5975e2e..47b84e6 100644
--- a/msm8998/QCamera2/HAL3/QCamera3Channel.cpp
+++ b/msm8998/QCamera2/HAL3/QCamera3Channel.cpp
@@ -3884,7 +3884,15 @@
 void QCamera3PicChannel::putStreamBufs()
 {
     QCamera3ProcessingChannel::putStreamBufs();
+    Mutex::Autolock lock(mFreeBuffersLock);
     mFreeBufferList.clear();
+
+    if (nullptr != mYuvMemory) {
+        uint32_t count = mYuvMemory->getCnt();
+        for (uint32_t i = 0; i < count; i++) {
+            mFreeBufferList.push_back(i);
+        }
+    }
 }
 
 int32_t QCamera3PicChannel::queueJpegSetting(uint32_t index, metadata_buffer_t *metadata)