diff --git a/shared/source/helpers/CMakeLists.txt b/shared/source/helpers/CMakeLists.txt
index affa9bf84d..34aa2f14cd 100644
--- a/shared/source/helpers/CMakeLists.txt
+++ b/shared/source/helpers/CMakeLists.txt
@@ -34,7 +34,6 @@ set(NEO_CORE_HELPERS
     ${CMAKE_CURRENT_SOURCE_DIR}/compiler_hw_info_config_bdw_and_later.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/compiler_options_parser.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/compiler_options_parser.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/completion_stamp.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/completion_stamp.h
     ${CMAKE_CURRENT_SOURCE_DIR}/constants.h
     ${CMAKE_CURRENT_SOURCE_DIR}/debug_helpers.h
diff --git a/shared/source/helpers/completion_stamp.cpp b/shared/source/helpers/completion_stamp.cpp
deleted file mode 100644
index cb2e460a74..0000000000
--- a/shared/source/helpers/completion_stamp.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (C) 2020-2021 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-#include "shared/source/helpers/completion_stamp.h"
-
-namespace NEO {
-
-const uint32_t CompletionStamp::notReady = 0xFFFFFFF0;
-
-} // namespace NEO
diff --git a/shared/source/helpers/completion_stamp.h b/shared/source/helpers/completion_stamp.h
index 6dad516a8e..2265663c83 100644
--- a/shared/source/helpers/completion_stamp.h
+++ b/shared/source/helpers/completion_stamp.h
@@ -16,7 +16,7 @@ struct CompletionStamp {
     uint32_t taskLevel;
     FlushStamp flushStamp;
 
-    static const uint32_t notReady;
+    static constexpr uint32_t notReady = 0xFFFFFFF0;
 };
 
 } // namespace NEO