diff --git a/.clang-format b/.clang-format
index 4b12e191..1fb97fcf 100644
--- a/.clang-format
+++ b/.clang-format
@@ -99,7 +99,7 @@ PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 60
 PointerAlignment: Right
 ReflowComments:  true
-SortIncludes:    false
+SortIncludes:    true
 SortUsingDeclarations: true
 SpaceAfterCStyleCast: false
 SpaceAfterLogicalNot: false
diff --git a/support/3rd_party/include/utils/encryption.hpp b/support/3rd_party/include/utils/encryption.hpp
index 91650ca9..fc182d57 100644
--- a/support/3rd_party/include/utils/encryption.hpp
+++ b/support/3rd_party/include/utils/encryption.hpp
@@ -98,7 +98,7 @@ encrypt_data(const std::array<unsigned char,
   const std::uint32_t size = boost::endian::native_to_big(
       static_cast<std::uint32_t>(buffer_size + encryption_header_size));
 
-  res.resize(buffer_size + header_size);
+  res.resize(buffer_size + encryption_header_size);
 
   unsigned long long mac_length{};
   if (crypto_aead_xchacha20poly1305_ietf_encrypt_detached(