diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
index 7e762b242a..69e16cc18c 100644
--- a/base/CMakeLists.txt
+++ b/base/CMakeLists.txt
@@ -54,7 +54,6 @@ set(SRC
   normalize_unicode.cpp
   non_intersecting_intervals.hpp
   observer_list.hpp
-  optional_lock_guard.hpp
   pprof.cpp
   pprof.hpp
   random.cpp
diff --git a/base/base_tests/CMakeLists.txt b/base/base_tests/CMakeLists.txt
index 972c3d1283..5f25859e97 100644
--- a/base/base_tests/CMakeLists.txt
+++ b/base/base_tests/CMakeLists.txt
@@ -27,7 +27,6 @@ set(SRC
   newtype_test.cpp
   non_intersecting_intervals_tests.cpp
   observer_list_test.cpp
-  optional_lock_guard_tests.cpp
   range_iterator_test.cpp
   ref_counted_tests.cpp
   regexp_test.cpp
diff --git a/base/base_tests/optional_lock_guard_tests.cpp b/base/base_tests/optional_lock_guard_tests.cpp
deleted file mode 100644
index 96c757bd43..0000000000
--- a/base/base_tests/optional_lock_guard_tests.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "testing/testing.hpp"
-
-#include "base/optional_lock_guard.hpp"
-
-#include <mutex>
-#include <optional>
-
-namespace
-{
-using namespace base;
-
-UNIT_TEST(OptionalLockGuard_Smoke)
-{
-  std::optional<std::mutex> optMtx;
-  {
-    base::OptionalLockGuard guard(optMtx);
-  }
-
-  std::optional<std::mutex> empty = std::nullopt;
-  base::OptionalLockGuard<std::mutex> guard(empty);
-}
-}  // namespace
diff --git a/base/optional_lock_guard.hpp b/base/optional_lock_guard.hpp
deleted file mode 100644
index c58e37a73a..0000000000
--- a/base/optional_lock_guard.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include <mutex>
-#include <optional>
-
-namespace base
-{
-template <typename Mutex>
-class OptionalLockGuard
-{
-public:
-  explicit OptionalLockGuard(std::optional<Mutex> & optionalMutex)
-    : m_optionalGuard(optionalMutex ? std::optional<std::lock_guard<Mutex>>(*optionalMutex)
-                                    : std::nullopt)
-  {
-  }
-
-private:
-  std::optional<std::lock_guard<Mutex>> m_optionalGuard;
-};
-}  // namespace base