diff --git a/net/webrtc/src/webrtcsink/imp.rs b/net/webrtc/src/webrtcsink/imp.rs
index c260993a..cdc46131 100644
--- a/net/webrtc/src/webrtcsink/imp.rs
+++ b/net/webrtc/src/webrtcsink/imp.rs
@@ -17,7 +17,7 @@ use once_cell::sync::Lazy;
 use std::collections::HashMap;
 
 use std::ops::Mul;
-use std::sync::{Arc, Condvar, Mutex};
+use std::sync::{mpsc, Arc, Condvar, Mutex};
 
 use super::homegrown_cc::CongestionController;
 use super::{WebRTCSinkCongestionControl, WebRTCSinkError, WebRTCSinkMitigationMode};
@@ -1387,7 +1387,7 @@ impl BaseWebRTCSink {
 
         let codecs_done_receiver = std::mem::take(&mut state.codecs_done_receivers);
         codecs_done_receiver.into_iter().for_each(|receiver| {
-            RUNTIME.spawn(async {
+            RUNTIME.block_on(async {
                 let _ = receiver.await;
             });
         });
@@ -3609,7 +3609,27 @@ impl ElementImpl for BaseWebRTCSink {
 
         match transition {
             gst::StateChange::PausedToReady => {
-                if let Err(err) = self.unprepare(&element) {
+                let unprepare_res = match tokio::runtime::Handle::try_current() {
+                    Ok(_) => {
+                        gst::error!(
+                            CAT,
+                            obj: element,
+                            "Trying to set state to NULL from an async \
+                                    tokio context, working around the panic but \
+                                    you should refactor your code to make use of \
+                                    gst::Element::call_async and set the state to \
+                                    NULL from there, without blocking the runtime"
+                        );
+                        let (tx, rx) = mpsc::channel();
+                        element.call_async(move |element| {
+                            tx.send(element.imp().unprepare(element)).unwrap();
+                        });
+                        rx.recv().unwrap()
+                    }
+                    Err(_) => self.unprepare(&element),
+                };
+
+                if let Err(err) = unprepare_res {
                     gst::element_error!(
                         element,
                         gst::StreamError::Failed,