diff --git a/src/AsapoWorker/streamer.py b/src/AsapoWorker/streamer.py
index 7b97afb34f8448f46a23e4f7be6d2d628c6003c3..a9201461a3ff47a549ac4b2a27afa9486c355031 100644
--- a/src/AsapoWorker/streamer.py
+++ b/src/AsapoWorker/streamer.py
@@ -1,5 +1,6 @@
 import logging
 from threading import Event
+import threading
 from asapo_producer import AsapoProducerError
 from AsapoWorker.errors import (
     TemporaryError, MissingDataError, ConfigurationError, EndOfStreamError,
@@ -239,6 +240,8 @@ class Streamer:
 
     def run(self):
         try:
+            threading.current_thread().name = "substream_{}".format(
+                self.receiver.substream)
             if self.metadata_receiver:
                 log.info("Waiting for substream metadata")
                 while not self.stopped.is_set():