diff --git a/webrtc/modules/video_coding/main/source/video_sender.cc b/webrtc/modules/video_coding/main/source/video_sender.cc
index 684a1a417..bfd22bd02 100644
--- a/webrtc/modules/video_coding/main/source/video_sender.cc
+++ b/webrtc/modules/video_coding/main/source/video_sender.cc
@@ -77,6 +77,10 @@ VideoSender::VideoSender(Clock* clock,
       current_codec_(),
       qm_settings_callback_(NULL),
       protection_callback_(NULL) {
+  // Allow VideoSender to be created on one thread but used on another, post
+  // construction. This is currently how this class is being used by at least
+  // one external project (diffractor).
+  main_thread_.DetachFromThread();
 }
 
 VideoSender::~VideoSender() {