diff --git a/changelog.d/3-bug-fixes/warp-connection-close b/changelog.d/3-bug-fixes/warp-connection-close
new file mode 100644
index 00000000000..cd7542f057d
--- /dev/null
+++ b/changelog.d/3-bug-fixes/warp-connection-close
@@ -0,0 +1,3 @@
+Ensure that HTTP 1.1 connections are grafully closed
+
+To fix this warp had to be patched to fix the bug upstream: https://github.com/yesodweb/wai/pull/958
\ No newline at end of file
diff --git a/nix/haskell-pins.nix b/nix/haskell-pins.nix
index 3328105e2a8..c4290b5253e 100644
--- a/nix/haskell-pins.nix
+++ b/nix/haskell-pins.nix
@@ -264,6 +264,17 @@ let
         sha256 = "sha256-xcGZ11ocdlB8ks20QAhtPZ+4ggmV4Om4CPHH/M6NjXk=";
       };
     };
+    # PR: https://github.com/yesodweb/wai/pull/958
+    warp = {
+      src = fetchgit {
+        url = "https://github.com/wireapp/wai";
+        rev = "bedd6a835f6d98128880465c30e8115fa986e3f6";
+        sha256 = "sha256-0r/d9YwcKZIZd10EhL2TP+W14Wjk0/S8Q4pVvZuZLaY=";
+      };
+      packages = {
+        "warp" = "warp";
+      };
+    };
   };
   hackagePins = {
     # Major re-write upstream, we should get rid of this dependency rather than
@@ -292,10 +303,6 @@ let
       version = "1.4.0";
       sha256 = "sha256-zPT/FMxAiR94NReqNIDa/RS7dtiNWCRe3SZi8P11GDk=";
     };
-    warp = {
-      version = "3.3.30";
-      sha256 = "sha256-VrK27a2wFtezh9qabcXGe2tw9EwBmI8mKwmpCtXq9rc=";
-    };
     warp-tls = {
       version = "3.4.3";
       sha256 = "sha256-6MjlCKGC8v+7OiSuMFGwO8sgcA3gp0OfOnneI2wSpWI=";