diff --git a/agent/agent.sh b/agent/agent.sh
index 8ced202..41b96f8 100644
--- a/agent/agent.sh
+++ b/agent/agent.sh
@@ -19,12 +19,21 @@ function checkNMI {
     echo "Received shutdown request through NMI.." > /dev/ttyS0
 
     /usr/syno/sbin/synoshutdown -s > /dev/null
-    exit 0
+    exit
 
   fi
 
 }
 
+finish() {
+
+  echo "Shutting down agent.." > /dev/ttyS0
+  exit
+
+}
+
+trap finish SIGINT SIGTERM
+
 # Setup serialport
 
 chmod 666 /dev/ttyS0