diff --git a/unified-runtime/source/adapters/level_zero/command_buffer.cpp b/unified-runtime/source/adapters/level_zero/command_buffer.cpp
index a69f23f286df..6c7d63d7416f 100644
--- a/unified-runtime/source/adapters/level_zero/command_buffer.cpp
+++ b/unified-runtime/source/adapters/level_zero/command_buffer.cpp
@@ -312,9 +312,6 @@ ur_result_t createSyncPointAndGetZeEvents(
   if (CommandBuffer->IsInOrderCmdList) {
     UR_CALL(createSyncPointBetweenCopyAndCompute(CommandBuffer, ZeCommandList,
                                                  ZeEventList));
-    if (!ZeEventList.empty()) {
-      NumSyncPointsInWaitList = ZeEventList.size();
-    }
     return UR_RESULT_SUCCESS;
   }
 
@@ -1330,9 +1327,9 @@ ur_result_t urCommandBufferAppendUSMPrefetchExp(
       CommandBuffer->ZeComputeCommandList, NumSyncPointsInWaitList,
       SyncPointWaitList, true, RetSyncPoint, ZeEventList, ZeLaunchEvent));
 
-  if (NumSyncPointsInWaitList) {
+  if (!ZeEventList.empty()) {
     ZE2UR_CALL(zeCommandListAppendWaitOnEvents,
-               (CommandBuffer->ZeComputeCommandList, NumSyncPointsInWaitList,
+               (CommandBuffer->ZeComputeCommandList, ZeEventList.size(),
                 ZeEventList.data()));
   }
 
@@ -1394,9 +1391,9 @@ ur_result_t urCommandBufferAppendUSMAdviseExp(
       NumSyncPointsInWaitList, SyncPointWaitList, true, RetSyncPoint,
       ZeEventList, ZeLaunchEvent));
 
-  if (NumSyncPointsInWaitList) {
+  if (!ZeEventList.empty()) {
     ZE2UR_CALL(zeCommandListAppendWaitOnEvents,
-               (CommandBuffer->ZeComputeCommandList, NumSyncPointsInWaitList,
+               (CommandBuffer->ZeComputeCommandList, ZeEventList.size(),
                 ZeEventList.data()));
   }
 
diff --git a/unified-runtime/test/conformance/exp_command_buffer/in-order.cpp b/unified-runtime/test/conformance/exp_command_buffer/in-order.cpp
index 9f8380850501..fd6335197cdf 100644
--- a/unified-runtime/test/conformance/exp_command_buffer/in-order.cpp
+++ b/unified-runtime/test/conformance/exp_command_buffer/in-order.cpp
@@ -16,10 +16,6 @@ struct urInOrderCommandBufferExpTest
   virtual void SetUp() override {
     UUR_RETURN_ON_FATAL_FAILURE(urCommandBufferExpExecutionTest::SetUp());
 
-    // Level-Zero bug https://github.com/intel/llvm/issues/18544
-    // Re-enable these tests once fixed
-    UUR_KNOWN_FAILURE_ON(uur::LevelZero{});
-
     ur_exp_command_buffer_desc_t desc{
         UR_STRUCTURE_TYPE_EXP_COMMAND_BUFFER_DESC, // stype
         nullptr,                                   // pnext