diff --git a/SAS/TMSS/client/lib/tmssbuslistener.py b/SAS/TMSS/client/lib/tmssbuslistener.py
index 27e20eb60951651fa078ee6e6cd9e26498331ca7..75d63297e8d5dfff5403d560c6cbc3843ffcd71e 100644
--- a/SAS/TMSS/client/lib/tmssbuslistener.py
+++ b/SAS/TMSS/client/lib/tmssbuslistener.py
@@ -56,13 +56,20 @@ class TMSSEventMessageHandler(AbstractMessageHandler):
     Base-type messagehandler for handling all TMSS event messages.
     Typical usage is to derive your own subclass from TMSSEventMessageHandler and implement the specific on<SomeMessage> methods that you are interested in.
     '''
+
+    def __init__(self, log_event_messages: bool=False) -> None:
+        self.log_event_messages = log_event_messages
+        super().__init__()
+
+
     def handle_message(self, msg: EventMessage):
         if not isinstance(msg, EventMessage):
             raise ValueError("%s: Ignoring non-EventMessage: %s" % (self.__class__.__name__, msg))
 
         stripped_subject = msg.subject.replace(_TMSS_EVENT_PREFIX_TEMPLATE%('',), '')
 
-        logger.info("%s %s: %s" % (self.__class__.__name__, stripped_subject, single_line_with_single_spaces(msg.content)))
+        if self.log_event_messages:
+            logger.info("%s %s: %s" % (self.__class__.__name__, stripped_subject, single_line_with_single_spaces(msg.content)))
 
         # sorry, very big if/elif/else tree.
         # it just maps all possible event subjects for all possible objects and statuses onto handler methods.