diff --git a/samples/systemd/electrumx.service b/samples/systemd/electrumx.service
index 46107f3..808ff7b 100644
--- a/samples/systemd/electrumx.service
+++ b/samples/systemd/electrumx.service
@@ -6,6 +6,8 @@ After=network.target
 EnvironmentFile=/etc/electrumx.conf
 ExecStart=/usr/local/bin/electrumx_server.py
 User=electrumx
+LimitNOFILE=8192
+TimeoutStopSec=30min
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target