googleapis
diff --git a/‎src/publisher/message-queues.ts‎
Lines changed: 8 additions & 0 deletions b/‎src/publisher/message-queues.ts‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎test/publisher/message-queues.ts‎
Lines changed: 11 additions & 0 deletions b/‎test/publisher/message-queues.ts‎
Lines changed: 11 additions & 0 deletions
@@ -354,6 +354,14 @@ export class OrderedQueue extends MessageQueue {
    * @fires OrderedQueue#drain
    */
   async publish(): Promise<void> {
+    // If there's nothing to flush, don't try, just short-circuit to the drain event.
+    // This can happen if we get a publish() call after already being drained, in
+    // the case that topic.flush() pulls a reference to us before we get deleted.
+    if (!this.batches.length) {
+      this.emit('drain');
+      return;
+    }
+
     this.inFlight = true;
 
     if (this.pending) {
 
@@ -729,6 +729,17 @@ describe('Message Queues', () => {
 
         assert.strictEqual(spy.callCount, 1);
       });
+
+      it('should emit "drain" if already empty on publish', async () => {
+        const spy = sandbox.spy();
+        sandbox.stub(queue, '_publish').resolves();
+
+        queue.on('drain', spy);
+        await queue.publish();
+        await queue.publish();
+
+        assert.strictEqual(spy.callCount, 2);
+      });
     });
 
     describe('resumePublishing', () => {