diff --git a/ChangeLog b/ChangeLog
index 019b5ed37e..a6c025a336 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-10  Wim Taymans  <wim@fluendo.com>
+
+	* ext/gconf/gstgconfaudiosink.c: (gst_gconf_audio_sink_reset):
+	* ext/gconf/gstgconfvideosink.c: (gst_gconf_video_sink_reset):
+	Make sure element is NULL before removing from the bin.
+
 2005-10-07  Andy Wingo  <wingo@pobox.com>
 
 	* ext/raw1394/gstdv1394src.c: Make interruptible, so it won't
diff --git a/ext/gconf/gstgconfaudiosink.c b/ext/gconf/gstgconfaudiosink.c
index 5c734da2d8..e849c7db09 100644
--- a/ext/gconf/gstgconfaudiosink.c
+++ b/ext/gconf/gstgconfaudiosink.c
@@ -74,6 +74,7 @@ gst_gconf_audio_sink_reset (GstGConfAudioSink * sink)
 
   /* fakesink */
   if (sink->kid) {
+    gst_element_set_state (sink->kid, GST_STATE_NULL);
     gst_bin_remove (GST_BIN (sink), sink->kid);
   }
   sink->kid = gst_element_factory_make ("fakesink", "testsink");
diff --git a/ext/gconf/gstgconfvideosink.c b/ext/gconf/gstgconfvideosink.c
index ccdc301839..f1f7eff8ba 100644
--- a/ext/gconf/gstgconfvideosink.c
+++ b/ext/gconf/gstgconfvideosink.c
@@ -74,6 +74,7 @@ gst_gconf_video_sink_reset (GstGConfVideoSink * sink)
 
   /* fakesink */
   if (sink->kid) {
+    gst_element_set_state (sink->kid, GST_STATE_NULL);
     gst_bin_remove (GST_BIN (sink), sink->kid);
   }
   sink->kid = gst_element_factory_make ("fakesink", "testsink");