diff --git a/contrib/openssl-cmake/include/evp_API_shim.h b/contrib/openssl-cmake/include/evp_API_shim.h
index 9ed3f40c3baa..76410c43c30c 100644
--- a/contrib/openssl-cmake/include/evp_API_shim.h
+++ b/contrib/openssl-cmake/include/evp_API_shim.h
@@ -124,7 +124,6 @@ static inline int BIO_do_handshake(BIO *b) {
     if (!ssl)
         return 0;
     if (!SSL_get_rbio(ssl) && BIO_next(b)) {
-        BIO_up_ref(BIO_next(b));
         BIO_up_ref(BIO_next(b));
         SSL_set_bio(ssl, BIO_next(b), BIO_next(b));
     }
diff --git a/src/Compression/CompressionCodecEncrypted.cpp b/src/Compression/CompressionCodecEncrypted.cpp
index e2f4b93747c8..84cb623e7380 100644
--- a/src/Compression/CompressionCodecEncrypted.cpp
+++ b/src/Compression/CompressionCodecEncrypted.cpp
@@ -683,7 +683,12 @@ namespace DB
 /// Register codecs for all algorithms
 void registerCodecEncrypted(CompressionCodecFactory & factory)
 {
+#if defined(FIPS_CLICKHOUSE) && FIPS_CLICKHOUSE
     registerEncryptionCodec(factory, AES_128_GCM);
     registerEncryptionCodec(factory, AES_256_GCM);
+#else
+    registerEncryptionCodec(factory, AES_128_GCM_SIV);
+    registerEncryptionCodec(factory, AES_256_GCM_SIV);
+#endif
 }
 }
diff --git a/src/Compression/fuzzers/encrypted_decompress_fuzzer.cpp b/src/Compression/fuzzers/encrypted_decompress_fuzzer.cpp
index 4566daf800c6..f8027a6dfe7d 100644
--- a/src/Compression/fuzzers/encrypted_decompress_fuzzer.cpp
+++ b/src/Compression/fuzzers/encrypted_decompress_fuzzer.cpp
@@ -309,8 +309,8 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
 
         auto config = generator.getResult();
 #if defined(FIPS_CLICKHOUSE) && FIPS_CLICKHOUSE
-        auto codec_128 = getCompressionCodecEncrypted(DB::AES_128_GCM_SIV);
-        auto codec_256 = getCompressionCodecEncrypted(DB::AES_256_GCM_SIV);
+        auto codec_128 = getCompressionCodecEncrypted(DB::AES_128_GCM);
+        auto codec_256 = getCompressionCodecEncrypted(DB::AES_256_GCM);
 #else
         auto codec_128 = getCompressionCodecEncrypted(DB::AES_128_GCM_SIV);
         auto codec_256 = getCompressionCodecEncrypted(DB::AES_256_GCM_SIV);