diff --git a/drivers/staging/android/ion/heaps/ion_carveout_heap.c b/drivers/staging/android/ion/heaps/ion_carveout_heap.c
index 7d55892535af..98e949362f0c 100644
--- a/drivers/staging/android/ion/heaps/ion_carveout_heap.c
+++ b/drivers/staging/android/ion/heaps/ion_carveout_heap.c
@@ -301,7 +301,8 @@ __ion_carveout_heap_create(struct ion_platform_heap *heap_data,
 	carveout_heap->heap.ion_heap.buf_ops = msm_ion_dma_buf_ops;
 	carveout_heap->heap.msm_heap_ops = &msm_carveout_heap_ops;
 	carveout_heap->heap.ion_heap.type = ION_HEAP_TYPE_CARVEOUT;
-	carveout_heap->heap.ion_heap.flags = ION_HEAP_FLAG_DEFER_FREE;
+	if (!dynamic_heap)
+		carveout_heap->heap.ion_heap.flags = ION_HEAP_FLAG_DEFER_FREE;
 
 	return &carveout_heap->heap.ion_heap;
 }