diff --git a/anki/mpv.py b/anki/mpv.py
index 61580224a..f53d9d0b6 100644
--- a/anki/mpv.py
+++ b/anki/mpv.py
@@ -197,6 +197,7 @@ class MPVBase:
         """Start up the communication threads.
         """
         self._thread = threading.Thread(target=self._reader)
+        self._thread.daemon = True
         self._thread.start()
 
     def _stop_thread(self):
@@ -450,6 +451,7 @@ class MPV(MPVBase):
         """
         super()._start_thread()
         self._event_thread = threading.Thread(target=self._event_reader)
+        self._event_thread.daemon = True
         self._event_thread.start()
 
     def _stop_thread(self):
diff --git a/aqt/mediasrv.py b/aqt/mediasrv.py
index cd9281ae2..e2f765985 100644
--- a/aqt/mediasrv.py
+++ b/aqt/mediasrv.py
@@ -47,6 +47,7 @@ class MediaServer(threading.Thread):
 
     _port = None
     _ready = threading.Event()
+    daemon = True
 
     def __init__(self, mw, *args, **kwargs):
         super().__init__(*args, **kwargs)