diff --git a/ptero_common/devserver.py b/ptero_common/devserver.py
index 096b661..0d79f7b 100644
--- a/ptero_common/devserver.py
+++ b/ptero_common/devserver.py
@@ -78,8 +78,11 @@ def cleanup():
 
 
 def log_and_cleanup(signum, frame):
+    signal.signal(signal.SIGINT, signal.SIG_IGN)
+    signal.signal(signal.SIGTERM, signal.SIG_IGN)
     sys.stderr.write("RECEIVED SIGNAL: '%s'\n" % signum)
     cleanup()
+    sys.exit(0)
 
 
 def setup_signal_handlers():