diff --git a/gst/rtsp-server/rtsp-client.c b/gst/rtsp-server/rtsp-client.c
index 67f00375ff..b0e10e3aa8 100644
--- a/gst/rtsp-server/rtsp-client.c
+++ b/gst/rtsp-server/rtsp-client.c
@@ -46,6 +46,8 @@ static void gst_rtsp_client_finalize (GObject * obj);
 static void client_session_finalized (GstRTSPClient * client,
     GstRTSPSession * session);
 
+static void unlink_streams (GstRTSPClient * client);
+
 G_DEFINE_TYPE (GstRTSPClient, gst_rtsp_client, G_TYPE_OBJECT);
 
 static void
@@ -99,6 +101,8 @@ gst_rtsp_client_finalize (GObject * obj)
 	(GWeakNotify) client_session_finalized, client);
   }
 
+  unlink_streams (client);
+
   g_list_free (client->sessions);
 
   gst_rtsp_connection_free (client->connection);