diff --git a/dom/media/MediaStreamGraph.cpp b/dom/media/MediaStreamGraph.cpp
index 98b0683f8f53..04743026e22d 100644
--- a/dom/media/MediaStreamGraph.cpp
+++ b/dom/media/MediaStreamGraph.cpp
@@ -2417,6 +2417,7 @@ MediaInputPort::Init()
 void
 MediaInputPort::Disconnect()
 {
+  MOZ_ASSERT(GraphImpl()->CurrentDriver()->OnThread());
   NS_ASSERTION(!mSource == !mDest,
                "mSource must either both be null or both non-null");
   if (!mSource)
diff --git a/dom/media/webaudio/AudioDestinationNode.cpp b/dom/media/webaudio/AudioDestinationNode.cpp
index 724748d60d01..329e8d88f6d2 100644
--- a/dom/media/webaudio/AudioDestinationNode.cpp
+++ b/dom/media/webaudio/AudioDestinationNode.cpp
@@ -557,7 +557,6 @@ AudioDestinationNode::WindowAudioCaptureChanged()
       mCaptureStreamPort =
         mStream->Graph()->ConnectToCaptureStream(id, mStream);
     } else {
-      mCaptureStreamPort->Disconnect();
       mCaptureStreamPort->Destroy();
     }
     mCaptured = captured;