diff --git a/.clang-format b/.clang-format
index be3546fc49d..f48449cf33c 100644
--- a/.clang-format
+++ b/.clang-format
@@ -132,9 +132,7 @@ PenaltyBreakAssignment: 100
 
 AllowShortFunctionsOnASingleLine: None
 
-# Disable for now since it complicates initial migration tests,
-# TODO: look into enabling this in the future.
-SortIncludes: false
+SortIncludes: true
 
 # Don't right align escaped newlines to the right because we have a wide default
 AlignEscapedNewlines: DontAlign