diff --git a/src/robot_interface/endpoints/face_detector.py b/src/robot_interface/endpoints/face_detector.py
index b45d088..e33e83d 100644
--- a/src/robot_interface/endpoints/face_detector.py
+++ b/src/robot_interface/endpoints/face_detector.py
@@ -57,10 +57,10 @@ class FaceDetectionSender(SocketBase):
 
         self._face_service.subscribe("FaceDetectionSender", 500, 0.0)
 
-        self._face_thread = threading.Thread(target=self._face_loop, daemon=True)
+        self._face_thread = threading.Thread(target=self._face_loop)
         self._face_thread.start()
 
-        self._rep_thread = threading.Thread(target=self._rep_loop, daemon=True)
+        self._rep_thread = threading.Thread(target=self._rep_loop)
         self._rep_thread.start()
 
         logging.info("Face detection + REP endpoint started.")
@@ -93,9 +93,6 @@ class FaceDetectionSender(SocketBase):
 
             time.sleep(0.1)
 
-    # ------------------------------------------------------------------
-    # REP loop (THIS WAS THE MISSING PIECE)
-    # ------------------------------------------------------------------
 
     def _rep_loop(self):
         """
@@ -118,9 +115,6 @@ class FaceDetectionSender(SocketBase):
                 logging.exception("Error in face detection REP loop")
                 time.sleep(0.1)
 
-    # ------------------------------------------------------------------
-    # Cleanup
-    # ------------------------------------------------------------------
 
     def stop_face_detection(self):
         try: