diff --git a/app/data/config/mainnet-eth/scripts/run-geth.sh b/app/data/config/mainnet-eth/scripts/run-geth.sh
index c249618b..3844ef99 100755
--- a/app/data/config/mainnet-eth/scripts/run-geth.sh
+++ b/app/data/config/mainnet-eth/scripts/run-geth.sh
@@ -23,6 +23,8 @@ cleanup() {
     echo "Done"
 }
 
+trap 'cleanup' SIGINT SIGTERM
+
 $START_CMD \
     --datadir="${CERC_ETH_DATADIR}" \
     --authrpc.addr="0.0.0.0" \