diff --git a/core/tmtc_backend.py b/core/tmtc_backend.py
index 392a009f2fe156e6b7d05904005139e828668441..9580eeed34db4de1e1cc0475c87b2bf9b389b457 100644
--- a/core/tmtc_backend.py
+++ b/core/tmtc_backend.py
@@ -171,8 +171,9 @@ class TmTcHandler:
             logging.error("Unknown Mode, Configuration error !")
             sys.exit()
 
-
     def __core_operation(self, one_shot):
+        if self.mode == g.ModeList.ListenerMode:
+            one_shot = False
         if not one_shot:
             while True:
                 self.__handle_action()