diff --git a/gst/elements/gstfakesrc.c b/gst/elements/gstfakesrc.c
index 9269f2c7ac..bed56e486f 100644
--- a/gst/elements/gstfakesrc.c
+++ b/gst/elements/gstfakesrc.c
@@ -749,18 +749,15 @@ gst_fakesrc_change_state (GstElement *element)
 
   fakesrc = GST_FAKESRC (element);
 
-  if (GST_STATE_PENDING (element) == GST_STATE_NULL) {
+  if (GST_STATE_PENDING (element) == GST_STATE_READY) {
+    fakesrc->buffer_count = 0;
+    fakesrc->pattern_byte = 0x00;
+    fakesrc->need_flush = FALSE;
     if (fakesrc->parent) {
       gst_buffer_unref (fakesrc->parent);
       fakesrc->parent = NULL;
     }
   }
-  else if (GST_STATE_PENDING (element) == GST_STATE_READY) {
-    fakesrc->buffer_count = 0;
-    fakesrc->pattern_byte = 0x00;
-    fakesrc->need_flush = FALSE;
-    fakesrc->parent = NULL;
-  }
 
   if (GST_ELEMENT_CLASS (parent_class)->change_state)
     return GST_ELEMENT_CLASS (parent_class)->change_state (element);
diff --git a/plugins/elements/gstfakesrc.c b/plugins/elements/gstfakesrc.c
index 9269f2c7ac..bed56e486f 100644
--- a/plugins/elements/gstfakesrc.c
+++ b/plugins/elements/gstfakesrc.c
@@ -749,18 +749,15 @@ gst_fakesrc_change_state (GstElement *element)
 
   fakesrc = GST_FAKESRC (element);
 
-  if (GST_STATE_PENDING (element) == GST_STATE_NULL) {
+  if (GST_STATE_PENDING (element) == GST_STATE_READY) {
+    fakesrc->buffer_count = 0;
+    fakesrc->pattern_byte = 0x00;
+    fakesrc->need_flush = FALSE;
     if (fakesrc->parent) {
       gst_buffer_unref (fakesrc->parent);
       fakesrc->parent = NULL;
     }
   }
-  else if (GST_STATE_PENDING (element) == GST_STATE_READY) {
-    fakesrc->buffer_count = 0;
-    fakesrc->pattern_byte = 0x00;
-    fakesrc->need_flush = FALSE;
-    fakesrc->parent = NULL;
-  }
 
   if (GST_ELEMENT_CLASS (parent_class)->change_state)
     return GST_ELEMENT_CLASS (parent_class)->change_state (element);