diff --git a/src/aura_engine/core/channels.py b/src/aura_engine/core/channels.py
index ac8cda5c6495df571b6d52af4e707ac08d26b7d0..061f909a00d25fe4ffc321a2d5b13a2281b81459 100644
--- a/src/aura_engine/core/channels.py
+++ b/src/aura_engine/core/channels.py
@@ -437,19 +437,14 @@ class StreamChannel(GenericChannel):
             (bool): True if track loaded successfully
 
         """
-        self.stop()
-        self.set_url(uri)
-        # TODO Review if still valid: Liquidsoap ignores commands sent without a certain timeout
-        time.sleep(2)
-        self.start()
-
-        # TODO Review if that's still required:
-        time.sleep(1)
+        self.logger.debug(SU.pink(f"Loading stream '{uri}'"))
         retry_delay = self.config.get("input_stream_retry_delay")
         max_retries = self.config.get("input_stream_max_retries")
         retries = 0
 
-        self.logger.debug(SU.pink(f"Loading stream '{uri}'"))
+        self.stop()
+        self.set_url(uri)
+        self.start()
 
         while not self.is_ready(uri):
             if retries >= max_retries:
diff --git a/src/aura_engine/core/mixer.py b/src/aura_engine/core/mixer.py
index d22e4fa615af6444a9cd99616d430cc01dbcf1d6..a32cce74e2ad636011536ee7263db77d5e89c443 100644
--- a/src/aura_engine/core/mixer.py
+++ b/src/aura_engine/core/mixer.py
@@ -70,7 +70,6 @@ class Mixer:
         self.channel_names = []
         self.channels = {}
 
-        time.sleep(1)  # TODO Check if this is still required
         self.refresh_channels()
 
         # TODO Graceful reboot: At some point the current track playing could