diff --git a/.clang-format b/.clang-format
index b2dc3def4a1..ddcb517cebf 100644
--- a/.clang-format
+++ b/.clang-format
@@ -12,7 +12,12 @@
 ---
 BasedOnStyle: LLVM
 AlignConsecutiveMacros: AcrossComments
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
 AllowShortEnumsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
 AttributeMacros:
   - __aligned
   - __deprecated