diff --git a/proxygen/lib/http/codec/HQStreamCodec.cpp b/proxygen/lib/http/codec/HQStreamCodec.cpp
index b9ef2d57f..d68239d98 100644
--- a/proxygen/lib/http/codec/HQStreamCodec.cpp
+++ b/proxygen/lib/http/codec/HQStreamCodec.cpp
@@ -508,8 +508,8 @@ void HQStreamCodec::generateHeaderImpl(folly::IOBufQueue& writeBuf,
                                        const HTTPMessage& msg,
                                        folly::Optional<StreamID> pushId,
                                        HTTPHeaderSize* size) {
-  folly::ThreadLocal<std::vector<std::string>> tempsTL;
-  folly::ThreadLocal<std::vector<compress::Header>> allHeadersTL;
+  static folly::ThreadLocal<std::vector<std::string>> tempsTL;
+  static folly::ThreadLocal<std::vector<compress::Header>> allHeadersTL;
   auto& temps = *tempsTL.get();
   auto& allHeaders = *allHeadersTL.get();
   temps.clear();
diff --git a/proxygen/lib/http/codec/compress/QPACKCodec.cpp b/proxygen/lib/http/codec/compress/QPACKCodec.cpp
index 8f1fb960f..2031863bd 100644
--- a/proxygen/lib/http/codec/compress/QPACKCodec.cpp
+++ b/proxygen/lib/http/codec/compress/QPACKCodec.cpp
@@ -46,7 +46,7 @@ QPACKEncoder::EncodeResult QPACKCodec::encode(
     vector<Header>& headers,
     uint64_t streamId,
     uint32_t maxEncoderStreamBytes) noexcept {
-  folly::ThreadLocal<std::vector<HPACKHeader>> preparedTL;
+  static folly::ThreadLocal<std::vector<HPACKHeader>> preparedTL;
   auto& prepared = *preparedTL.get();
   encodedSize_.uncompressed = compress::prepareHeaders(headers, prepared);
   auto res = encoder_.encode(prepared, encodeHeadroom_, streamId,