diff --git a/ChangeLog b/ChangeLog
index 8ca8b65040..21da607bed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-14  Wim Taymans  <wim@fluendo.com>
+
+	* libs/gst/base/gstbasesrc.c: (gst_base_src_change_state):
+	If the parent state change function failed, don't assume we can safely
+	stop the source, this will be done when the pads are deactivated.
+
 2006-08-14  Wim Taymans  <wim@fluendo.com>
 
 	* gst/gstbuffer.c:
diff --git a/libs/gst/base/gstbasesrc.c b/libs/gst/base/gstbasesrc.c
index 3c961beb5c..e788b3406e 100644
--- a/libs/gst/base/gstbasesrc.c
+++ b/libs/gst/base/gstbasesrc.c
@@ -2018,7 +2018,6 @@ gst_base_src_change_state (GstElement * element, GstStateChange transition)
 failure:
   {
     GST_DEBUG_OBJECT (basesrc, "parent failed state change");
-    gst_base_src_stop (basesrc);
     return result;
   }
 error_stop: