diff --git a/server/mediaserver.go b/server/mediaserver.go
index a99b84c0a9..5f3d5c1ebc 100644
--- a/server/mediaserver.go
+++ b/server/mediaserver.go
@@ -254,6 +254,9 @@ func gotRTMPStreamHandler(s *LivepeerServer) func(url *url.URL, rtmpStrm stream.
 				if err := s.LivepeerNode.BroadcastFinishMsg(hlsStrmID.String()); err != nil {
 					glog.Errorf("Error broadcaseting finish message: %v", err)
 				}
+				// Stop the incoming RTMP connection.
+				// TODO retry segmentation if err != SegmenterTimeout; may be recoverable
+				rtmpStrm.Close()
 			}
 		}(broadcaster, rtmpStrm)