diff --git a/src/target/trx_toolkit/clck_gen.py b/src/target/trx_toolkit/clck_gen.py
index 92ca217c5..a50c9858e 100755
--- a/src/target/trx_toolkit/clck_gen.py
+++ b/src/target/trx_toolkit/clck_gen.py
@@ -70,6 +70,7 @@ class CLCKGen:
 
 		# Initialize and start a new thread
 		self._thread = threading.Thread(target = self._worker)
+		self._thread.setDaemon(True)
 		self._thread.start()
 
 	def stop(self):
@@ -128,6 +129,9 @@ class Application(ApplicationBase):
 		self.clck = CLCKGen([self.link], ind_period = 51)
 		self.clck.start()
 
+		# Block unless we receive a signal
+		self.clck._thread.join()
+
 	def sig_handler(self, signum, frame):
 		log.info("Signal %d received" % signum)
 		if signum == signal.SIGINT: