diff --git a/cabal.project b/cabal.project
index 81df343b755..c0c9d989abb 100644
--- a/cabal.project
+++ b/cabal.project
@@ -142,6 +142,11 @@ source-repository-package
     location: https://github.com/wireapp/saml2-web-sso
     tag: 74371cd775cb98d6cf85f6e182244a3c4fd48702
 
+source-repository-package
+    type: git
+    location: https://gitlab.com/axeman/cql-io
+    tag: c2b6aa995b5817ed7c78c53f72d5aa586ef87c36
+
 source-repository-package
     type: git
     location: https://gitlab.com/axeman/swagger
diff --git a/cabal.project.freeze b/cabal.project.freeze
index a26406ae156..da0e31f39ce 100644
--- a/cabal.project.freeze
+++ b/cabal.project.freeze
@@ -575,7 +575,6 @@ constraints: any.AC-Angle ==1.0,
              any.cpu ==0.1.2,
              any.cpuinfo ==0.1.0.2,
              any.cql ==4.0.3,
-             any.cql-io ==1.1.1,
              any.cql-io-tinylog ==0.1.0,
              any.crackNum ==3.1,
              any.crc32c ==0.0.0,
@@ -1153,6 +1152,8 @@ constraints: any.AC-Angle ==1.0,
              any.hourglass ==0.2.12,
              any.hourglass-orphans ==0.1.0.0,
              any.hp2pretty ==0.10,
+             any.hpack ==0.34.5,
+             any.hpack-dhall ==0.5.3,
              any.hpc-codecov ==0.3.0.0,
              any.hpc-lcov ==1.0.1,
              any.hprotoc ==2.4.17,
@@ -2457,6 +2458,7 @@ constraints: any.AC-Angle ==1.0,
              any.time-units ==1.0.0,
              any.timeit ==2.0,
              any.timelens ==0.2.0.2,
+             any.timeout ==0.1.1,
              any.timer-wheel ==0.3.0,
              any.timerep ==2.0.1.0,
              any.timezone-olson ==0.2.0,
diff --git a/changelog.d/3-bug-fixes/cql-io-control b/changelog.d/3-bug-fixes/cql-io-control
new file mode 100644
index 00000000000..13030baac02
--- /dev/null
+++ b/changelog.d/3-bug-fixes/cql-io-control
@@ -0,0 +1 @@
+Fix cql-io bug where restarting whole cassandra cluster could cause downtime. Upstream changes in https://gitlab.com/twittner/cql-io/-/merge_requests/20
\ No newline at end of file
diff --git a/stack.yaml b/stack.yaml
index 8bdbcfd2551..330a3c96a7c 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -146,6 +146,10 @@ extra-deps:
 - git: https://gitlab.com/axeman/swagger
   commit: e2d3f5b5274b8d8d301b5377b0af4319cea73f9e
 
+# Use forked cql-io for https://gitlab.com/twittner/cql-io/-/merge_requests/20
+- git: https://gitlab.com/axeman/cql-io
+  commit: c2b6aa995b5817ed7c78c53f72d5aa586ef87c36
+
 ############################################################
 # Wire packages
 ############################################################
@@ -215,7 +219,6 @@ extra-deps:
 
 - HsOpenSSL-x509-system-0.1.0.4
 - cql-4.0.3
-- cql-io-1.1.1
 - primitive-extras-0.10.1.1
 - text-format-0.3.2
 - hex-0.2.0