diff --git a/CEP/TBB/TBBdatawriter/TBBTMSSBusListener.py b/CEP/TBB/TBBdatawriter/TBBTMSSBusListener.py
index 1e37074cb5a301797e7848fea32c5dd783ee5ead..ed91501cfab76b97f3fa76ee3c09de9ec8dc52b3 100644
--- a/CEP/TBB/TBBdatawriter/TBBTMSSBusListener.py
+++ b/CEP/TBB/TBBdatawriter/TBBTMSSBusListener.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+from lofar.messaging.messagebus import BusListenerJanitor
 from lofar.sas.tmss.client.tmssbuslistener import TMSSBusListener, TMSSEventMessageHandler
 from lofar.sas.tmss.client.tmss_http_rest_client import TMSSsession
 from lofar.common.util import waitForInterrupt
@@ -188,7 +189,9 @@ def main():
     else:
         print("No observation running, waiting for next observation")
 
-    with TMSSBusListener(handler_type=TBBTMSSEventMessageHandler, num_threads=1):
+    # run TMSSBusListener with TBBTMSSEventMessageHandler
+    # wrap in BusListenerJanitor to auto-delete queue upon exit
+    with BusListenerJanitor(TMSSBusListener(handler_type=TBBTMSSEventMessageHandler, num_threads=1)):
         waitForInterrupt()
 
 if __name__ == '__main__':