diff --git a/.gitmodules b/.gitmodules
index 2477762b8..9b49fa876 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -35,3 +35,4 @@
 [submodule "external/ngtcp2"]
 	path = external/ngtcp2
 	url = https://github.com/ngtcp2/ngtcp2.git
+	branch = v0.1.0
\ No newline at end of file
diff --git a/cmake/ngtcp2_lib.cmake b/cmake/ngtcp2_lib.cmake
index c6d06a42a..a14160b15 100644
--- a/cmake/ngtcp2_lib.cmake
+++ b/cmake/ngtcp2_lib.cmake
@@ -45,8 +45,9 @@ function(add_ngtcp2_lib)
 
   configure_file(ngtcp2/cmakeconfig.h.in ngtcp2/config.h)
   include_directories("${CMAKE_CURRENT_BINARY_DIR}/ngtcp2") # for config.h
-
+  set(ENABLE_STATIC_LIB ON FORCE BOOL)
+  set(ENABLE_SHARED_LIB OFF FORCE BOOL)
   add_subdirectory(ngtcp2/lib EXCLUDE_FROM_ALL)
 
-  target_compile_definitions(ngtcp2 PRIVATE -DHAVE_CONFIG_H -D_GNU_SOURCE)
+  target_compile_definitions(ngtcp2_static PRIVATE -DHAVE_CONFIG_H -D_GNU_SOURCE)
 endfunction()
diff --git a/external/ngtcp2 b/external/ngtcp2
index 15ba6021c..026b8434e 160000
--- a/external/ngtcp2
+++ b/external/ngtcp2
@@ -1 +1 @@
-Subproject commit 15ba6021ca352e2e60f9b43f4b96d2e97a42f60b
+Subproject commit 026b8434ebcbeec48939d1c7671a0a4d5c75202b
diff --git a/llarp/CMakeLists.txt b/llarp/CMakeLists.txt
index 05a60bbc3..bab1c90ca 100644
--- a/llarp/CMakeLists.txt
+++ b/llarp/CMakeLists.txt
@@ -241,7 +241,7 @@ if(WITH_HIVE)
   )
 endif()
 
-target_link_libraries(liblokinet PUBLIC cxxopts lokinet-platform lokinet-util lokinet-cryptography sqlite_orm ngtcp2)
+target_link_libraries(liblokinet PUBLIC cxxopts lokinet-platform lokinet-util lokinet-cryptography sqlite_orm ngtcp2_static)
 target_link_libraries(liblokinet PRIVATE libunbound)
 
 
diff --git a/llarp/quic/address.hpp b/llarp/quic/address.hpp
index 5f7bc3522..a6b56a243 100644
--- a/llarp/quic/address.hpp
+++ b/llarp/quic/address.hpp
@@ -21,7 +21,7 @@ namespace llarp::quic
   class Address
   {
     sockaddr_in6 saddr{};
-    ngtcp2_addr a{sizeof(saddr), reinterpret_cast<sockaddr*>(&saddr)};
+    ngtcp2_addr a{reinterpret_cast<sockaddr*>(&saddr), sizeof(saddr)};
 
    public:
     Address() = default;
@@ -102,7 +102,7 @@ namespace llarp::quic
     Address local_, remote_;
 
    public:
-    ngtcp2_path path{{local_.sockaddr_size(), local_}, {remote_.sockaddr_size(), remote_}, nullptr};
+    ngtcp2_path path{{local_, local_.sockaddr_size()}, {remote_, remote_.sockaddr_size()}, nullptr};
 
     // Public accessors are const:
     const Address& local = local_;
diff --git a/llarp/quic/endpoint.cpp b/llarp/quic/endpoint.cpp
index 5d57e9010..6fa7be772 100644
--- a/llarp/quic/endpoint.cpp
+++ b/llarp/quic/endpoint.cpp
@@ -245,6 +245,8 @@ namespace llarp::quic
           u8data(conn.conn_buffer),
           conn.conn_buffer.size(),
           code,
+          nullptr,  // reason
+          0,        // reason length
           get_timestamp());
       if (written <= 0)
       {