diff --git a/dask-gateway/setup.py b/dask-gateway/setup.py
index fcea04fb..8ff9d48f 100644
--- a/dask-gateway/setup.py
+++ b/dask-gateway/setup.py
@@ -11,6 +11,12 @@
 # in ../dev-environment.yaml
 install_requires = [
     "aiohttp",
+    # FIXME: click 8.0.4 works, but 8.1.0-8.1.2 has found to cause failures for
+    #        currently unknown reasons.
+    #
+    #        This is tracked in https://github.com/dask/dask-gateway/issues/522.
+    #
+    "click == 8.0.4",
     "dask >= 2.2.0",
     "distributed >= 2.2.0",
     "pyyaml",
diff --git a/dev-environment.yaml b/dev-environment.yaml
index 2a0e6f59..c6c709f1 100644
--- a/dev-environment.yaml
+++ b/dev-environment.yaml
@@ -13,6 +13,7 @@ dependencies:
   # - dask-gateway/setup.py
   # - dask-gateway-server/setup.py
   - aiohttp # dask-gateway, dask-gateway-server
+  - click # dask-gateway
   - dask # dask-gateway
   - distributed # dask-gateway
   - pyyaml # dask-gateway