diff --git a/.env.example b/.env.example
index ab971910852950347f10be05a20e7717e7748972..09ab8607e00de47cb0dd62e7b600d7981f8640b3 100644
--- a/.env.example
+++ b/.env.example
@@ -105,6 +105,11 @@ NETWORK_NAME=haf
 # Additional Hivemind sync arguments
 HIVEMIND_SYNC_ARGS=
 
+# Timeout for Hivemind API calls, any queries that take longer than
+# this time will be aborted.  0 for unlimited, or give a nonzero
+# time limit in milliseconds
+# HIVEMIND_STATEMENT_TIMEOUT=0
+
 # The default setup will run the recommended version of balance tracker,
 # you can run a custom version by un-commenting and modifying the
 # values below
diff --git a/hivemind.yaml b/hivemind.yaml
index db3ffff9a3df4863e757eea10faf8a71d1534da5..4c321f1003173458f9cb717fd226b416ddd2e125 100644
--- a/hivemind.yaml
+++ b/hivemind.yaml
@@ -9,6 +9,7 @@ services:
     command:
       - "setup"
       - "--database-admin-url=postgresql://haf_admin@haf/haf_block_log"
+      - "--statement-timeout=${HIVEMIND_STATEMENT_TIMEOUT:-0}"
     depends_on:
       haf:
         condition: service_healthy