diff --git a/infra/ec2-userdata.sh b/infra/ec2-userdata.sh
index ed0ed13..34ba809 100755
--- a/infra/ec2-userdata.sh
+++ b/infra/ec2-userdata.sh
@@ -7,6 +7,14 @@ set -euo pipefail
 
 echo "=== EveryTab EC2 Bootstrap ==="
 
+# --- File descriptor limits ---
+echo "--- Raising file descriptor limits ---"
+echo '* soft nofile 65536' | sudo tee -a /etc/security/limits.conf
+echo '* hard nofile 65536' | sudo tee -a /etc/security/limits.conf
+# Also set for current session
+ulimit -n 65536
+echo "File descriptor limit: $(ulimit -n)"
+
 # --- Swap ---
 echo "--- Creating swap file ---"
 if [ ! -f /swapfile ]; then