diff --git a/.clang-tidy b/.clang-tidy
index 0794aa66661f..8386718cd9ee 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,7 +1,7 @@
-Checks:          'clang-diagnostic-*,clang-analyzer-*,abseil-*,bugprone-*,modernize-*,performance-*,readability-redundant-*,readability-braces-around-statements'
+Checks:          'clang-diagnostic-*,clang-analyzer-*,abseil-*,bugprone-*,modernize-*,performance-*,readability-redundant-*,readability-braces-around-statements,fuchsia-statically-constructed-objects'
 
 #TODO(lizan): grow this list, fix possible warnings and make more checks as error
-WarningsAsErrors: 'bugprone-assert-side-effect,modernize-make-shared,modernize-make-unique,readability-redundant-smartptr-get,readability-braces-around-statements,readability-redundant-string-cstr,bugprone-use-after-move'
+WarningsAsErrors: 'bugprone-assert-side-effect,modernize-make-shared,modernize-make-unique,readability-redundant-smartptr-get,readability-braces-around-statements,readability-redundant-string-cstr,bugprone-use-after-move,fuchsia-statically-constructed-objects'
 
 CheckOptions:
   - key:             bugprone-assert-side-effect.AssertMacros
diff --git a/include/envoy/singleton/manager.h b/include/envoy/singleton/manager.h
index 9721d9318ff8..529f7e7e65b4 100644
--- a/include/envoy/singleton/manager.h
+++ b/include/envoy/singleton/manager.h
@@ -45,9 +45,11 @@ template <const char* name_param> class RegistrationImpl : public Registration {
  */
 #define SINGLETON_MANAGER_REGISTRATION(NAME)                                                       \
   static constexpr char NAME##_singleton_name[] = #NAME "_singleton";                              \
-  static Envoy::Registry::RegisterFactory<                                                         \
-      Envoy::Singleton::RegistrationImpl<NAME##_singleton_name>, Envoy::Singleton::Registration>   \
-      NAME##_singleton_registered_;
+  static Envoy::Registry::                                                                         \
+      RegisterFactory</* NOLINT(fuchsia-statically-constructed-objects) */                         \
+                      Envoy::Singleton::RegistrationImpl<NAME##_singleton_name>,                   \
+                      Envoy::Singleton::Registration>                                              \
+          NAME##_singleton_registered_;
 
 #define SINGLETON_MANAGER_REGISTERED_NAME(NAME) NAME##_singleton_name