diff --git a/level_zero/core/source/cmdlist/cmdlist.h b/level_zero/core/source/cmdlist/cmdlist.h
index 7021c717ae..f71388f33c 100644
--- a/level_zero/core/source/cmdlist/cmdlist.h
+++ b/level_zero/core/source/cmdlist/cmdlist.h
@@ -81,8 +81,8 @@ struct CommandList : _ze_command_list_handle_t {
         void *pCommand = nullptr;
         CommandType type = Invalid;
     };
-    using CommandsToPatch = StackVec<CommandToPatch, 16>;
-    using CmdListReturnPoints = StackVec<CmdListReturnPoint, 32>;
+    using CommandsToPatch = std::vector<CommandToPatch>;
+    using CmdListReturnPoints = std::vector<CmdListReturnPoint>;
 
     virtual ze_result_t close() = 0;
     virtual ze_result_t destroy() = 0;
diff --git a/level_zero/core/source/cmdlist/cmdlist_imp.cpp b/level_zero/core/source/cmdlist/cmdlist_imp.cpp
index 85dbd44123..c24b68bb4e 100644
--- a/level_zero/core/source/cmdlist/cmdlist_imp.cpp
+++ b/level_zero/core/source/cmdlist/cmdlist_imp.cpp
@@ -37,6 +37,9 @@ CommandList::CommandList(uint32_t numIddsPerBlock) : commandContainer(numIddsPer
     if (NEO::debugManager.flags.SplitBcsSize.get() != -1) {
         this->minimalSizeForBcsSplit = NEO::debugManager.flags.SplitBcsSize.get() * MemoryConstants::kiloByte;
     }
+
+    commandsToPatch.reserve(16);
+    returnPoints.reserve(32);
 }
 
 CommandListAllocatorFn commandListFactory[IGFX_MAX_PRODUCT] = {};