diff --git a/net/quinn/src/quinnquicsrc/imp.rs b/net/quinn/src/quinnquicsrc/imp.rs
index b2a37efb..2e970f2d 100644
--- a/net/quinn/src/quinnquicsrc/imp.rs
+++ b/net/quinn/src/quinnquicsrc/imp.rs
@@ -836,6 +836,9 @@ impl QuinnQuicSrc {
             }
         };
 
+        // TODO:
+        // Decide if the ordering matters when we might have a STREAM
+        // Close followed by a Connection Close almost immediately.
         let mut tasks: FuturesUnordered<BoxFuture<QuinnFuture>> = FuturesUnordered::new();
 
         tasks.push(Box::pin(datagram(connection.clone())));
diff --git a/net/quinn/tests/quinnquic.rs b/net/quinn/tests/quinnquic.rs
index 911ce520..9765491a 100644
--- a/net/quinn/tests/quinnquic.rs
+++ b/net/quinn/tests/quinnquic.rs
@@ -44,6 +44,9 @@ fn test_send_receive_without_datagram() {
 
         assert!(h1.push(make_buffer(content)) == Ok(gst::FlowSuccess::Ok));
 
+        // Wait a bit before sending Eos and shutting down the pipeline
+        thread::sleep(std::time::Duration::from_secs(2));
+
         h1.push_event(gst::event::Eos::new());
 
         h1.element().unwrap().set_state(gst::State::Null).unwrap();