diff --git a/talk/app/webrtc/datachannel.cc b/talk/app/webrtc/datachannel.cc
index 497242422f..9195f8d47d 100644
--- a/talk/app/webrtc/datachannel.cc
+++ b/talk/app/webrtc/datachannel.cc
@@ -336,9 +336,9 @@ void DataChannel::SendQueuedSendData() {
 }
 
 void DataChannel::ClearQueuedSendData() {
-  while (!queued_received_data_.empty()) {
-    DataBuffer* buffer = queued_received_data_.front();
-    queued_received_data_.pop();
+  while (!queued_send_data_.empty()) {
+    DataBuffer* buffer = queued_send_data_.front();
+    queued_send_data_.pop_front();
     delete buffer;
   }
 }
diff --git a/talk/app/webrtc/datachannel_unittest.cc b/talk/app/webrtc/datachannel_unittest.cc
index d3faf177aa..a2f898ed94 100644
--- a/talk/app/webrtc/datachannel_unittest.cc
+++ b/talk/app/webrtc/datachannel_unittest.cc
@@ -49,12 +49,13 @@ class SctpDataChannelTest : public testing::Test {
                                         new cricket::FakeDeviceManager(),
                                         new cricket::CaptureManager(),
                                         talk_base::Thread::Current())),
+        ms_signaling_(new webrtc::MediaStreamSignaling(
+                          talk_base::Thread::Current(), NULL)),
         session_(channel_manager_.get(),
                  talk_base::Thread::Current(),
                  talk_base::Thread::Current(),
                  NULL,
-                 new webrtc::MediaStreamSignaling(talk_base::Thread::Current(),
-                                                  NULL)),
+                 ms_signaling_.get()),
         webrtc_data_channel_(NULL) {}
 
   virtual void SetUp() {
@@ -90,6 +91,7 @@ class SctpDataChannelTest : public testing::Test {
   cricket::FakeMediaEngine* media_engine_;
   cricket::FakeDataEngine* data_engine_;
   talk_base::scoped_ptr<cricket::ChannelManager> channel_manager_;
+  talk_base::scoped_ptr<webrtc::MediaStreamSignaling> ms_signaling_;
   webrtc::WebRtcSession session_;
   talk_base::scoped_refptr<webrtc::DataChannel> webrtc_data_channel_;
 };