diff --git a/core/tmtc_backend.py b/core/tmtc_backend.py
index 24a6f312de886ca41c4257f6f262425cffb538d6..322e7a125a578197eeaf279b18cf28d942b74188 100644
--- a/core/tmtc_backend.py
+++ b/core/tmtc_backend.py
@@ -65,7 +65,7 @@ class TmTcHandler:
                 if self.mode == g.ModeList.Idle:
                     LOGGER.info("TMTC Client in idle mode")
                     time.sleep(5)
-                if self.mode == g.ModeList.ListenerMode:
+                elif self.mode == g.ModeList.ListenerMode:
                     time.sleep(1)
             except KeyboardInterrupt:
                 LOGGER.info("Closing TMTC client.")
diff --git a/core/tmtc_client_core.py b/core/tmtc_client_core.py
index 608507f5c9cf43394e8a1f56b05cf1adfd64e059..70dcffea83af12974dfa9e1d912a31420cc81e4f 100755
--- a/core/tmtc_client_core.py
+++ b/core/tmtc_client_core.py
@@ -56,16 +56,17 @@ def run_tmtc_client(use_gui: bool):
     else:
         tmtc_handler = TmTcHandler(g.G_MODE_ID)
 
-    tmtc_handler_task = tmtc_handler.prepare_start()
+    # tmtc_handler_task = tmtc_handler.prepare_start()
     tmtc_frontend_task = Process()
 
     if use_gui:
         tmtc_frontend = TmTcFrontend(tmtc_handler)
         tmtc_frontend_task = tmtc_frontend.prepare_start()
         tmtc_frontend_task.start()
-    tmtc_handler_task.start()
+    # tmtc_handler_task.start()
+    tmtc_handler.perform_operation()
 
-    tmtc_handler_task.join()
+    # tmtc_handler_task.join()
     if use_gui:
         tmtc_frontend_task.join()