diff --git a/plugins/python-codecs/package-lock.json b/plugins/python-codecs/package-lock.json
index d900012de..b0d4e92af 100644
--- a/plugins/python-codecs/package-lock.json
+++ b/plugins/python-codecs/package-lock.json
@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/python-codecs",
-   "version": "0.1.35",
+   "version": "0.1.37",
    "lockfileVersion": 3,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/python-codecs",
-         "version": "0.1.35",
+         "version": "0.1.37",
          "devDependencies": {
             "@scrypted/sdk": "file:../../sdk"
          }
diff --git a/plugins/python-codecs/package.json b/plugins/python-codecs/package.json
index 3793be6c0..e3c63a61b 100644
--- a/plugins/python-codecs/package.json
+++ b/plugins/python-codecs/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/python-codecs",
-   "version": "0.1.35",
+   "version": "0.1.37",
    "description": "Python Codecs for Scrypted",
    "keywords": [
       "scrypted",
diff --git a/plugins/python-codecs/src/gst_generator.py b/plugins/python-codecs/src/gst_generator.py
index 8b1f268fa..2b470e54a 100644
--- a/plugins/python-codecs/src/gst_generator.py
+++ b/plugins/python-codecs/src/gst_generator.py
@@ -17,13 +17,12 @@ except:
 class Callback:
     def __init__(self, callback) -> None:
         if callback:
-            self.loop = asyncio.get_running_loop()
             self.callback = callback
         else:
-            self.loop = None
             self.callback = None
 
-def createPipelineIterator(pipeline: str):
+async def createPipelineIterator(pipeline: str):
+    loop = asyncio.get_running_loop()
     pipeline = '{pipeline} ! queue leaky=downstream max-size-buffers=0 ! appsink name=appsink emit-signals=true sync=false max-buffers=-1 drop=true'.format(pipeline=pipeline)
     print(pipeline)
     gst = Gst.parse_launch(pipeline)
@@ -52,8 +51,7 @@ def createPipelineIterator(pipeline: str):
         hasFinished = True
         callback = Callback(None)
         callbackQueue.put(callback)
-        if not asyncFuture.done():
-            asyncFuture.set_result(None)
+        asyncio.run_coroutine_threadsafe(sampleQueue.put(None), loop = loop)
         if not finished.done():
             finished.set_result(None)
 
@@ -66,23 +64,20 @@ def createPipelineIterator(pipeline: str):
 
     appsink = gst.get_by_name('appsink')
     callbackQueue = Queue()
-    asyncFuture = asyncio.Future()
+    sampleQueue = asyncio.Queue()
 
     async def gen():
         try:      
             while True:
-                nonlocal asyncFuture
-                asyncFuture = asyncio.Future()
                 yieldFuture = asyncio.Future()
                 async def asyncCallback(sample):
-                    asyncFuture.set_result(sample)
+                    sampleQueue.put_nowait(sample)
                     await yieldFuture
                 callbackQueue.put(Callback(asyncCallback))
-                sample = await asyncFuture
-                if not sample:
-                    yieldFuture.set_result(None)
-                    break
                 try:
+                    sample = await sampleQueue.get()
+                    if not sample:
+                        break
                     yield sample
                 finally:
                     yieldFuture.set_result(None)
@@ -100,10 +95,10 @@ def createPipelineIterator(pipeline: str):
         if not callback.callback or hasFinished:
             hasFinished = True
             if callback.callback:
-                asyncio.run_coroutine_threadsafe(callback.callback(None), loop = callback.loop)
+                asyncio.run_coroutine_threadsafe(callback.callback(None), loop = loop)
             return Gst.FlowReturn.OK
 
-        future = asyncio.run_coroutine_threadsafe(callback.callback(sample), loop = callback.loop)
+        future = asyncio.run_coroutine_threadsafe(callback.callback(sample), loop = loop)
         try:
             future.result()
         except:
diff --git a/plugins/python-codecs/src/gstreamer.py b/plugins/python-codecs/src/gstreamer.py
index 0efa20b44..1e9edde39 100644
--- a/plugins/python-codecs/src/gstreamer.py
+++ b/plugins/python-codecs/src/gstreamer.py
@@ -80,7 +80,7 @@ async def generateVideoFramesGstreamer(mediaObject: scrypted_sdk.MediaObject, op
 
     videosrc += ' ! {decoder} ! queue leaky=downstream max-size-buffers=0 ! videoconvert ! {videocaps}'.format(decoder=decoder, videocaps=videocaps)
 
-    gst, gen = createPipelineIterator(videosrc)
+    gst, gen = await createPipelineIterator(videosrc)
     async for gstsample in gen():
         caps = gstsample.get_caps()
         height = caps.get_structure(0).get_value('height')
diff --git a/plugins/python-codecs/src/libav.py b/plugins/python-codecs/src/libav.py
index 889d8e9ea..25a2ae696 100644
--- a/plugins/python-codecs/src/libav.py
+++ b/plugins/python-codecs/src/libav.py
@@ -1,5 +1,4 @@
 import time
-from gst_generator import createPipelineIterator
 import scrypted_sdk
 from typing import Any
 import vipsimage