diff --git a/src/client/BUILD.bazel b/src/client/BUILD.bazel
index be65b80d2b..3864129f5b 100644
--- a/src/client/BUILD.bazel
+++ b/src/client/BUILD.bazel
@@ -84,7 +84,6 @@ mozc_cc_library(
         "//base:file_util",
         "//base:process",
         "//base:run_level",
-        "//base:singleton",
         "//base:system_util",
         "//base:version",
         "//base:vlog",
diff --git a/src/client/client.cc b/src/client/client.cc
index 3921073835..91cd6c7aeb 100644
--- a/src/client/client.cc
+++ b/src/client/client.cc
@@ -48,7 +48,6 @@
 #include "base/file_stream.h"
 #include "base/file_util.h"
 #include "base/process.h"
-#include "base/singleton.h"
 #include "base/system_util.h"
 #include "base/version.h"
 #include "base/vlog.h"
@@ -926,19 +925,14 @@ bool Client::OpenBrowser(absl::string_view url) {
 }
 
 namespace {
-class DefaultClientFactory : public ClientFactoryInterface {
- public:
-  std::unique_ptr<ClientInterface> NewClient() override {
-    return std::make_unique<Client>();
-  }
-};
 
 ClientFactoryInterface *g_client_factory = nullptr;
+
 }  // namespace
 
 std::unique_ptr<ClientInterface> ClientFactory::NewClient() {
   if (g_client_factory == nullptr) {
-    return Singleton<DefaultClientFactory>::get()->NewClient();
+    return std::make_unique<Client>();
   } else {
     return g_client_factory->NewClient();
   }