diff --git a/level_zero/tools/source/debug/linux/xe/debug_session.cpp b/level_zero/tools/source/debug/linux/xe/debug_session.cpp
index c457f22aeb..91a9baed49 100644
--- a/level_zero/tools/source/debug/linux/xe/debug_session.cpp
+++ b/level_zero/tools/source/debug/linux/xe/debug_session.cpp
@@ -194,6 +194,7 @@ void DebugSessionLinuxXe::handleEvent(drm_xe_eudebug_event *event) {
             DEBUG_BREAK_IF(clientHandleToConnection.find(clientEvent->client_handle) != clientHandleToConnection.end());
             clientHandleToConnection[clientEvent->client_handle].reset(new ClientConnectionXe);
             clientHandleToConnection[clientEvent->client_handle]->client = *clientEvent;
+            clientHandle = clientEvent->client_handle;
         }
 
         if (event->flags & DRM_XE_EUDEBUG_EVENT_DESTROY) {
@@ -229,7 +230,6 @@ void DebugSessionLinuxXe::handleEvent(drm_xe_eudebug_event *event) {
             UNRECOVERABLE_IF(clientHandleToConnection.find(execQueue->client_handle) == clientHandleToConnection.end());
 
             if (!processEntryEventGenerated) {
-                clientHandle = execQueue->client_handle;
                 zet_debug_event_t debugEvent = {};
                 debugEvent.type = ZET_DEBUG_EVENT_TYPE_PROCESS_ENTRY;
                 pushApiEvent(debugEvent);
diff --git a/level_zero/tools/test/unit_tests/sources/debug/linux/xe/test_debug_api_linux_xe.cpp b/level_zero/tools/test/unit_tests/sources/debug/linux/xe/test_debug_api_linux_xe.cpp
index 2c9a4758df..24ee1f0921 100644
--- a/level_zero/tools/test/unit_tests/sources/debug/linux/xe/test_debug_api_linux_xe.cpp
+++ b/level_zero/tools/test/unit_tests/sources/debug/linux/xe/test_debug_api_linux_xe.cpp
@@ -534,6 +534,7 @@ TEST_F(DebugApiLinuxTestXe, GivenEuDebugOpenEventWithEventCreateFlagWhenHandleEv
     EXPECT_NE(session->clientHandleToConnection.find(client1.client_handle), session->clientHandleToConnection.end());
     EXPECT_NE(session->clientHandleToConnection.find(client2.client_handle), session->clientHandleToConnection.end());
 
+    EXPECT_EQ(session->clientHandle, 0x123456788u);
     uint64_t wrongClientHandle = 34;
     EXPECT_EQ(session->clientHandleToConnection.find(wrongClientHandle), session->clientHandleToConnection.end());
 }