diff --git a/.idea/runConfigurations/tmtcclient_Service_17_UDP.xml b/.idea/runConfigurations/tmtcclient_Service_17_UDP.xml
index 20619467d64c2c7257e21a1fa282cde93912dcef..f7ad144c2a5e5866b22fdbddef4cac4d12cac1e7 100644
--- a/.idea/runConfigurations/tmtcclient_Service_17_UDP.xml
+++ b/.idea/runConfigurations/tmtcclient_Service_17_UDP.xml
@@ -12,7 +12,7 @@
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/core/tmtc_client_core.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
     <option name="PARAMETERS" value="-m 3 -c 3 -s 17 -t 3" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
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()