diff --git a/gst/rtsp-server/rtsp-media.c b/gst/rtsp-server/rtsp-media.c
index 69ecded96d..033e973b34 100644
--- a/gst/rtsp-server/rtsp-media.c
+++ b/gst/rtsp-server/rtsp-media.c
@@ -2204,6 +2204,8 @@ wait_status:
 was_prepared:
   {
     GST_LOG ("media %p was prepared", media);
+    /* we are not going to use the giving thread, so stop it. */
+    gst_rtsp_thread_stop (thread);
     g_rec_mutex_unlock (&priv->state_lock);
     return TRUE;
   }