diff --git a/.clang-format b/.clang-format
index 5d97094c..e950a8f9 100644
--- a/.clang-format
+++ b/.clang-format
@@ -20,6 +20,7 @@ EmptyLineBeforeAccessModifier: Always
 IncludeBlocks: Regroup
 IndentAccessModifiers: false
 IndentWidth: 4
+InsertBraces: true
 InsertNewlineAtEOF: true
 PointerAlignment: Left
 QualifierAlignment: Custom
diff --git a/.clang-tidy b/.clang-tidy
index 189ddf5a..37ee0b97 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,6 +1,5 @@
 Checks: >
   -*,
-  readability-braces-around-statements,
   modernize-use-override
-WarningsAsErrors: '-*,readability-braces-around-statements,modernize-use-override'
+WarningsAsErrors: '-*,modernize-use-override'
 HeaderFilterRegex: ".*"