diff --git a/netwerk/protocol/rtsp/rtsp/RTSPConnectionHandler.h b/netwerk/protocol/rtsp/rtsp/RTSPConnectionHandler.h
index a61e40078d8..b94700044e6 100644
--- a/netwerk/protocol/rtsp/rtsp/RTSPConnectionHandler.h
+++ b/netwerk/protocol/rtsp/rtsp/RTSPConnectionHandler.h
@@ -840,12 +840,6 @@ struct RtspConnectionHandler : public AHandler {
                 size_t trackIndex = 0;
                 msg->findSize("trackIndex", &trackIndex);
                 postQueueEOS(trackIndex, ERROR_END_OF_STREAM);
-                TrackInfo *info = &mTracks.editItemAt(trackIndex);
-                if (info) {
-                  mRTPConn->removeStream(info->mRTPSocket, info->mRTCPSocket);
-                  PR_Close(info->mRTPSocket);
-                  PR_Close(info->mRTCPSocket);
-                }
                 break;
             }
 
diff --git a/netwerk/protocol/rtsp/rtsp/RTSPSource.cpp b/netwerk/protocol/rtsp/rtsp/RTSPSource.cpp
index ff17988b7a5..0b3cb63a901 100644
--- a/netwerk/protocol/rtsp/rtsp/RTSPSource.cpp
+++ b/netwerk/protocol/rtsp/rtsp/RTSPSource.cpp
@@ -247,7 +247,7 @@ void RTSPSource::performSuspend() {
 }
 
 void RTSPSource::performSeek(int64_t seekTimeUs) {
-    if (mState != PLAYING && mState != PAUSING) {
+    if (mState != CONNECTED && mState != PLAYING && mState != PAUSING) {
         return;
     }