diff --git a/components/gfx/paint_task.rs b/components/gfx/paint_task.rs
index 6ba95a6aaf9..4b64bde4dd9 100644
--- a/components/gfx/paint_task.rs
+++ b/components/gfx/paint_task.rs
@@ -197,7 +197,7 @@ pub enum Msg {
 pub enum LayoutToPaintMsg {
     PaintInit(Epoch, PaintLayer),
     CanvasLayer(LayerId, IpcSender<CanvasMsg>),
-    Exit(Option<IpcSender<()>>, PipelineExitType),
+    Exit(IpcSender<()>, PipelineExitType),
 }
 
 pub enum ChromeToPaintMsg {
@@ -388,7 +388,7 @@ impl<C> PaintTask<C> where C: PaintListener + Send + 'static {
                     self.compositor.notify_paint_task_exiting(self.id);
 
                     debug!("PaintTask: Exiting.");
-                    response_channel.as_ref().map(|channel| channel.send(()));
+                    let _ = response_channel.send(());
                     break;
                 }
                 Msg::FromChrome(ChromeToPaintMsg::Exit(_)) => {
diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs
index 5394aa178f5..97ffc67f8d2 100644
--- a/components/layout/layout_task.rs
+++ b/components/layout/layout_task.rs
@@ -740,7 +740,7 @@ impl LayoutTask {
         }
 
         let (response_chan, response_port) = ipc::channel().unwrap();
-        self.paint_chan.send(LayoutToPaintMsg::Exit(Some(response_chan), exit_type)).unwrap();
+        self.paint_chan.send(LayoutToPaintMsg::Exit(response_chan, exit_type)).unwrap();
         response_port.recv().unwrap()
     }