diff --git a/unified-runtime/source/adapters/level_zero/v2/command_buffer.cpp b/unified-runtime/source/adapters/level_zero/v2/command_buffer.cpp
index bd1831340c059..08ed9ce2ad705 100644
--- a/unified-runtime/source/adapters/level_zero/v2/command_buffer.cpp
+++ b/unified-runtime/source/adapters/level_zero/v2/command_buffer.cpp
@@ -35,7 +35,8 @@ ur_exp_command_buffer_handle_t_::ur_exp_command_buffer_handle_t_(
     const ur_exp_command_buffer_desc_t *desc)
     : commandListManager(
           context, device,
-          std::forward<v2::raii::command_list_unique_handle>(commandList)),
+          std::forward<v2::raii::command_list_unique_handle>(commandList),
+          v2::EVENT_FLAGS_COUNTER, nullptr),
       isUpdatable(desc ? desc->isUpdatable : false) {}
 
 ur_result_t ur_exp_command_buffer_handle_t_::finalizeCommandBuffer() {
diff --git a/unified-runtime/source/adapters/level_zero/v2/command_list_manager.cpp b/unified-runtime/source/adapters/level_zero/v2/command_list_manager.cpp
index 975a859f29fa0..2148cdd828822 100644
--- a/unified-runtime/source/adapters/level_zero/v2/command_list_manager.cpp
+++ b/unified-runtime/source/adapters/level_zero/v2/command_list_manager.cpp
@@ -172,7 +172,7 @@ ur_command_list_manager::getWaitListView(const ur_event_handle_t *phWaitEvents,
 ze_event_handle_t
 ur_command_list_manager::getSignalEvent(ur_event_handle_t *hUserEvent,
                                         ur_command_t commandType) {
-  if (hUserEvent && queue) {
+  if (hUserEvent) {
     *hUserEvent = eventPool->allocate();
     (*hUserEvent)->resetQueueAndCommand(queue, commandType);
     return (*hUserEvent)->getZeEvent();
diff --git a/unified-runtime/source/adapters/level_zero/v2/command_list_manager.hpp b/unified-runtime/source/adapters/level_zero/v2/command_list_manager.hpp
index 24d84335e7210..d70709b50fb4f 100644
--- a/unified-runtime/source/adapters/level_zero/v2/command_list_manager.hpp
+++ b/unified-runtime/source/adapters/level_zero/v2/command_list_manager.hpp
@@ -36,8 +36,7 @@ struct ur_command_list_manager {
   ur_command_list_manager(ur_context_handle_t context,
                           ur_device_handle_t device,
                           v2::raii::command_list_unique_handle &&commandList,
-                          v2::event_flags_t flags = v2::EVENT_FLAGS_COUNTER,
-                          ur_queue_t_ *queue = nullptr);
+                          v2::event_flags_t flags, ur_queue_t_ *queue);
   ur_command_list_manager(ur_command_list_manager &&src) = default;
   ~ur_command_list_manager();
 
diff --git a/unified-runtime/source/adapters/level_zero/v2/queue_immediate_in_order.cpp b/unified-runtime/source/adapters/level_zero/v2/queue_immediate_in_order.cpp
index 3209ec9b7d121..a3aa366e7ed2f 100644
--- a/unified-runtime/source/adapters/level_zero/v2/queue_immediate_in_order.cpp
+++ b/unified-runtime/source/adapters/level_zero/v2/queue_immediate_in_order.cpp
@@ -90,7 +90,7 @@ ur_queue_immediate_in_order_t::ur_queue_immediate_in_order_t(
                   }
                 }
               }),
-          eventFlagsFromQueueFlags(flags)) {}
+          eventFlagsFromQueueFlags(flags), this) {}
 
 ze_event_handle_t ur_queue_immediate_in_order_t::getSignalEvent(
     locked<ur_command_list_manager> &commandList, ur_event_handle_t *hUserEvent,