diff --git a/python/led.py b/python/led.py
index 4e84314..0fcfe8e 100644
--- a/python/led.py
+++ b/python/led.py
@@ -18,11 +18,17 @@ elif config.DEVICE == 'pi':
     strip.begin()
 elif config.DEVICE == 'blinkstick':
     from blinkstick import blinkstick
-    import atexit
+    import signal
+    #Will turn all leds off when invoked.
+    def signal_handler(signal, frame):
+        all_off = [0]*(config.N_PIXELS*3)
+        stick.set_led_data(0, all_off)
+        sys.exit(0)
+
     stick = blinkstick.find_first()
     # Create a listener that turns the leds off when the program terminates
-    all_off = [0]*(config.N_PIXELS*3)
-    atexit.register(lambda: stick.set_led_data(0, all_off))
+    signal.signal(signal.SIGTERM, signal_handler)
+    signal.signal(signal.SIGINT, signal_handler)
 
 _gamma = np.load(config.GAMMA_TABLE_PATH)
 """Gamma lookup table used for nonlinear brightness correction"""