diff --git a/spf/grbl_sdr_collect_v2.py b/spf/grbl_sdr_collect_v2.py
index 71557357..a3ceaa24 100644
--- a/spf/grbl_sdr_collect_v2.py
+++ b/spf/grbl_sdr_collect_v2.py
@@ -49,14 +49,18 @@ def prepare_record_entry(ds: DataSnapshot, rx_pos: np.array, tx_pos: np.array):
     )
 
 
-def signal_handler(sig, frame):
-    logging.info("Ctrl-c issued -> SHUT IT DOWN!")
+def shutdown():
     global run_collection
     run_collection = False
     shutdown_radios()
     stop_grbl()
 
 
+def signal_handler(sig, frame):
+    logging.info("Ctrl-c issued -> SHUT IT DOWN!")
+    shutdown()
+
+
 signal.signal(signal.SIGINT, signal_handler)
 
 
@@ -312,6 +316,7 @@ def bounce_grbl(gm):
             )
             ###
             read_thread.read_lock.release()
+    shutdown()
     logging.info("Shuttingdown: sending false to threads")
     for read_thread in read_threads:
         read_thread.run = False