diff --git a/packages/shared/src/queue.test.ts b/packages/shared/src/queue.test.ts
index 05f9b8d..1a5f550 100644
--- a/packages/shared/src/queue.test.ts
+++ b/packages/shared/src/queue.test.ts
@@ -12,6 +12,16 @@ describe('queue', () => {
     expect(await queue.pull()).toBe('b')
   })
 
+  it('returns buffered undefined items in order', async () => {
+    const queue = new Queue<string | undefined>()
+
+    queue.push(undefined)
+    queue.push('a')
+
+    expect(await queue.pull()).toBeUndefined()
+    expect(await queue.pull()).toBe('a')
+  })
+
   it('resolves a pending pull on push', async () => {
     const queue = new Queue<string>()
 
diff --git a/packages/shared/src/queue.ts b/packages/shared/src/queue.ts
index c152dbf..b4db816 100644
--- a/packages/shared/src/queue.ts
+++ b/packages/shared/src/queue.ts
@@ -30,10 +30,8 @@ export class Queue<T> {
    * @throws when the queue is closed or aborted. Note that buffered items can still be pulled after close until the buffer is drained.
    */
   async pull(): Promise<T> {
-    const item = this.items.shift()
-
-    if (item !== undefined) {
-      return item
+    if (this.items.length > 0) {
+      return this.items.shift() as T
     }
 
     if (this.closed) {