diff --git a/level_zero/core/source/semaphore/external_semaphore_imp.cpp b/level_zero/core/source/semaphore/external_semaphore_imp.cpp
index b4d5fcac2f..692a053dd1 100644
--- a/level_zero/core/source/semaphore/external_semaphore_imp.cpp
+++ b/level_zero/core/source/semaphore/external_semaphore_imp.cpp
@@ -54,12 +54,12 @@ ze_result_t ExternalSemaphoreImp::initialize(ze_device_handle_t device, const ze
     if (semaphoreDesc->pNext != nullptr) {
         const ze_base_desc_t *extendedDesc =
             reinterpret_cast<const ze_base_desc_t *>(semaphoreDesc->pNext);
-        if (extendedDesc->stype == ZE_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_WIN32_EXT_DESC) { // NOLINT(clang-analyzer-optin.core.EnumCastOutOfRange)
+        if (extendedDesc->stype == ZE_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_WIN32_EXT_DESC) {
             const ze_external_semaphore_win32_ext_desc_t *extendedSemaphoreDesc =
                 reinterpret_cast<const ze_external_semaphore_win32_ext_desc_t *>(extendedDesc);
             handle = extendedSemaphoreDesc->handle;
             name = extendedSemaphoreDesc->name;
-        } else if (extendedDesc->stype == ZE_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_FD_EXT_DESC) { // NOLINT(clang-analyzer-optin.core.EnumCastOutOfRange)
+        } else if (extendedDesc->stype == ZE_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_FD_EXT_DESC) {
             const ze_external_semaphore_fd_ext_desc_t *extendedSemaphoreDesc =
                 reinterpret_cast<const ze_external_semaphore_fd_ext_desc_t *>(extendedDesc);
             fd = extendedSemaphoreDesc->fd;
diff --git a/level_zero/core/test/unit_tests/mt_tests/semaphore/windows/test_mt_semaphore_windows.cpp b/level_zero/core/test/unit_tests/mt_tests/semaphore/windows/test_mt_semaphore_windows.cpp
index 934a11d42d..434e1958a9 100644
--- a/level_zero/core/test/unit_tests/mt_tests/semaphore/windows/test_mt_semaphore_windows.cpp
+++ b/level_zero/core/test/unit_tests/mt_tests/semaphore/windows/test_mt_semaphore_windows.cpp
@@ -60,7 +60,7 @@ HWTEST_F(WddmExternalSemaphoreMTTest, givenValidExternalSemaphoreWhenImportExter
 
     desc.flags = ZE_EXTERNAL_SEMAPHORE_EXT_FLAG_D3D12_FENCE;
 
-    win32Desc.stype = ZE_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_WIN32_EXT_DESC; // NOLINT(clang-analyzer-optin.core.EnumCastOutOfRange)
+    win32Desc.stype = ZE_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_WIN32_EXT_DESC;
     win32Desc.handle = reinterpret_cast<void *>(extSemaphoreHandle);
 
     desc.pNext = &win32Desc;
@@ -141,7 +141,7 @@ HWTEST2_F(WddmExternalSemaphoreMTTest, givenEnqueueSignalFailsWhenExternalSemaph
 
     desc.flags = ZE_EXTERNAL_SEMAPHORE_EXT_FLAG_D3D12_FENCE;
 
-    win32Desc.stype = ZE_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_WIN32_EXT_DESC; // NOLINT(clang-analyzer-optin.core.EnumCastOutOfRange)
+    win32Desc.stype = ZE_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_WIN32_EXT_DESC;
     win32Desc.handle = reinterpret_cast<void *>(extSemaphoreHandle);
 
     desc.pNext = &win32Desc;
@@ -185,7 +185,7 @@ HWTEST2_F(WddmExternalSemaphoreMTTest, givenSemaphoreSignalOperationEventWhenExt
 
     desc.flags = ZE_EXTERNAL_SEMAPHORE_EXT_FLAG_D3D12_FENCE;
 
-    win32Desc.stype = ZE_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_WIN32_EXT_DESC; // NOLINT(clang-analyzer-optin.core.EnumCastOutOfRange)
+    win32Desc.stype = ZE_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_WIN32_EXT_DESC;
     win32Desc.handle = reinterpret_cast<void *>(extSemaphoreHandle);
 
     desc.pNext = &win32Desc;
@@ -240,7 +240,7 @@ HWTEST2_F(WddmExternalSemaphoreMTTest, givenImmediateCommandListWhenAppendWaitEx
 
     desc.flags = ZE_EXTERNAL_SEMAPHORE_EXT_FLAG_D3D12_FENCE;
 
-    win32Desc.stype = ZE_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_WIN32_EXT_DESC; // NOLINT(clang-analyzer-optin.core.EnumCastOutOfRange)
+    win32Desc.stype = ZE_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_WIN32_EXT_DESC;
     win32Desc.handle = reinterpret_cast<void *>(extSemaphoreHandle);
 
     desc.pNext = &win32Desc;
@@ -278,7 +278,7 @@ HWTEST2_F(WddmExternalSemaphoreMTTest, givenRegularCommandListWhenAppendWaitExte
 
     desc.flags = ZE_EXTERNAL_SEMAPHORE_EXT_FLAG_D3D12_FENCE;
 
-    win32Desc.stype = ZE_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_WIN32_EXT_DESC; // NOLINT(clang-analyzer-optin.core.EnumCastOutOfRange)
+    win32Desc.stype = ZE_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_WIN32_EXT_DESC;
     win32Desc.handle = reinterpret_cast<void *>(extSemaphoreHandle);
 
     desc.pNext = &win32Desc;
@@ -347,7 +347,7 @@ HWTEST2_F(WddmExternalSemaphoreMTTest, givenInternalProxyEventFailsToAppendWhenA
 
     desc.flags = ZE_EXTERNAL_SEMAPHORE_EXT_FLAG_D3D12_FENCE;
 
-    win32Desc.stype = ZE_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_WIN32_EXT_DESC; // NOLINT(clang-analyzer-optin.core.EnumCastOutOfRange)
+    win32Desc.stype = ZE_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_WIN32_EXT_DESC;
     win32Desc.handle = reinterpret_cast<void *>(extSemaphoreHandle);
 
     desc.pNext = &win32Desc;
@@ -388,7 +388,7 @@ HWTEST2_F(WddmExternalSemaphoreMTTest, givenWaitEventFailsToAppendWhenAppendWait
 
     desc.flags = ZE_EXTERNAL_SEMAPHORE_EXT_FLAG_D3D12_FENCE;
 
-    win32Desc.stype = ZE_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_WIN32_EXT_DESC; // NOLINT(clang-analyzer-optin.core.EnumCastOutOfRange)
+    win32Desc.stype = ZE_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_WIN32_EXT_DESC;
     win32Desc.handle = reinterpret_cast<void *>(extSemaphoreHandle);
 
     desc.pNext = &win32Desc;
@@ -430,7 +430,7 @@ HWTEST2_F(WddmExternalSemaphoreMTTest, givenSignalEventFailsWhenAppendWaitExtern
 
     desc.flags = ZE_EXTERNAL_SEMAPHORE_EXT_FLAG_D3D12_FENCE;
 
-    win32Desc.stype = ZE_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_WIN32_EXT_DESC; // NOLINT(clang-analyzer-optin.core.EnumCastOutOfRange)
+    win32Desc.stype = ZE_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_WIN32_EXT_DESC;
     win32Desc.handle = reinterpret_cast<void *>(extSemaphoreHandle);
 
     desc.pNext = &win32Desc;
diff --git a/level_zero/core/test/unit_tests/sources/semaphore/linux/test_semaphore_linux.cpp b/level_zero/core/test/unit_tests/sources/semaphore/linux/test_semaphore_linux.cpp
index 6d481c44b0..6930e1c0ed 100644
--- a/level_zero/core/test/unit_tests/sources/semaphore/linux/test_semaphore_linux.cpp
+++ b/level_zero/core/test/unit_tests/sources/semaphore/linux/test_semaphore_linux.cpp
@@ -55,7 +55,7 @@ HWTEST_F(DrmExternalSemaphoreTest, givenDriverModelDrmWhenImportExternalSemaphor
 
     desc.flags = ZE_EXTERNAL_SEMAPHORE_EXT_FLAG_OPAQUE_FD;
 
-    fdDesc.stype = ZE_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_FD_EXT_DESC; // NOLINT(clang-analyzer-optin.core.EnumCastOutOfRange)
+    fdDesc.stype = ZE_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_FD_EXT_DESC;
     fdDesc.fd = fd;
 
     desc.pNext = &fdDesc;
@@ -65,4 +65,4 @@ HWTEST_F(DrmExternalSemaphoreTest, givenDriverModelDrmWhenImportExternalSemaphor
 }
 
 } // namespace ult
-} // namespace L0
\ No newline at end of file
+} // namespace L0