diff --git a/playout/libretime_playout/main.py b/playout/libretime_playout/main.py
index fa69ec4e9..9e9a60a50 100644
--- a/playout/libretime_playout/main.py
+++ b/playout/libretime_playout/main.py
@@ -113,13 +113,13 @@ def cli(
     )
     wait_for_liquidsoap(liq_client)
 
-    fetch_queue: Queue[Dict[str, Any]] = Queue()
-    push_queue: Queue[Events] = Queue()
+    fetch_queue: "Queue[Dict[str, Any]]" = Queue()
+    push_queue: "Queue[Events]" = Queue()
     # This queue is shared between pypo-fetch and pypo-file, where pypo-file
     # is the consumer. Pypo-fetch will send every schedule it gets to pypo-file
     # and pypo will parse this schedule to determine which file has the highest
     # priority, and retrieve it.
-    file_queue: Queue[FileEvents] = Queue()
+    file_queue: "Queue[FileEvents]" = Queue()
 
     pypo_liquidsoap = PypoLiquidsoap(liq_client)
 
diff --git a/playout/libretime_playout/message_handler.py b/playout/libretime_playout/message_handler.py
index 7995d4431..6dc48417d 100644
--- a/playout/libretime_playout/message_handler.py
+++ b/playout/libretime_playout/message_handler.py
@@ -20,7 +20,7 @@ class MessageHandler(ConsumerMixin):
     def __init__(
         self,
         connection: Connection,
-        fetch_queue: ThreadQueue[Dict[str, Any]],
+        fetch_queue: "ThreadQueue[Dict[str, Any]]",
     ):
         self.connection = connection
 
@@ -71,7 +71,7 @@ class MessageListener:
     def __init__(
         self,
         config: Config,
-        fetch_queue: ThreadQueue[Dict[str, Any]],
+        fetch_queue: "ThreadQueue[Dict[str, Any]]",
     ) -> None:
         self.config = config
         self.fetch_queue = fetch_queue
diff --git a/playout/libretime_playout/player/fetch.py b/playout/libretime_playout/player/fetch.py
index 35ad6cbc3..c32dafc04 100644
--- a/playout/libretime_playout/player/fetch.py
+++ b/playout/libretime_playout/player/fetch.py
@@ -43,9 +43,9 @@ class PypoFetch(Thread):
     # pylint: disable=too-many-arguments
     def __init__(
         self,
-        fetch_queue: Queue[Dict[str, Any]],
-        push_queue: Queue[Events],
-        file_queue: Queue[FileEvents],
+        fetch_queue: "Queue[Dict[str, Any]]",
+        push_queue: "Queue[Events]",
+        file_queue: "Queue[FileEvents]",
         liq_client: LiquidsoapClient,
         pypo_liquidsoap: PypoLiquidsoap,
         config: Config,
diff --git a/playout/libretime_playout/player/file.py b/playout/libretime_playout/player/file.py
index 6e9bc8498..82fe75fca 100644
--- a/playout/libretime_playout/player/file.py
+++ b/playout/libretime_playout/player/file.py
@@ -19,12 +19,12 @@ class PypoFile(Thread):
     name = "file"
     daemon = True
 
-    file_events_queue: Queue[FileEvents]
+    file_events_queue: "Queue[FileEvents]"
     file_events: FileEvents
 
     def __init__(
         self,
-        file_queue: Queue[FileEvents],
+        file_queue: "Queue[FileEvents]",
         api_client: ApiClient,
     ):
         Thread.__init__(self)
diff --git a/playout/libretime_playout/player/push.py b/playout/libretime_playout/player/push.py
index 90b42fdda..99a44afed 100644
--- a/playout/libretime_playout/player/push.py
+++ b/playout/libretime_playout/player/push.py
@@ -28,7 +28,7 @@ class PypoPush(Thread):
 
     def __init__(
         self,
-        push_queue: Queue[Events],
+        push_queue: "Queue[Events]",
         pypo_liquidsoap: PypoLiquidsoap,
         config: Config,
     ):
@@ -37,7 +37,7 @@ class PypoPush(Thread):
 
         self.config = config
 
-        self.future_scheduled_queue: Queue[Events] = Queue()
+        self.future_scheduled_queue: "Queue[Events]" = Queue()
         self.pypo_liquidsoap = pypo_liquidsoap
 
         self.plq = PypoLiqQueue(self.future_scheduled_queue, self.pypo_liquidsoap)
diff --git a/playout/libretime_playout/player/queue.py b/playout/libretime_playout/player/queue.py
index aa0ac37a2..70d314f9b 100644
--- a/playout/libretime_playout/player/queue.py
+++ b/playout/libretime_playout/player/queue.py
@@ -18,7 +18,7 @@ class PypoLiqQueue(Thread):
 
     def __init__(
         self,
-        future_queue: Queue[Dict[str, Any]],
+        future_queue: "Queue[Dict[str, Any]]",
         pypo_liquidsoap: PypoLiquidsoap,
     ):
         Thread.__init__(self)