diff --git a/sys/dvb/dvbbasebin.c b/sys/dvb/dvbbasebin.c
index c0b7dd78d1..f3d804dfba 100644
--- a/sys/dvb/dvbbasebin.c
+++ b/sys/dvb/dvbbasebin.c
@@ -239,7 +239,8 @@ dvb_base_bin_class_init (DvbBaseBinClass * klass)
 
   /* install dvbsrc properties */
   dvbsrc_factory = gst_element_factory_find ("dvbsrc");
-  dvbsrc_class = g_type_class_ref (dvbsrc_factory->type);
+  dvbsrc_class =
+      g_type_class_ref (gst_element_factory_get_element_type (dvbsrc_factory));
   walk = proxyed_properties;
   while (walk->prop_name != NULL) {
     GParamSpec *pspec;
diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c
index 3fd7963ad4..7721f490ff 100644
--- a/sys/dvb/gstdvbsrc.c
+++ b/sys/dvb/gstdvbsrc.c
@@ -952,7 +952,7 @@ stopped:
     GST_DEBUG_OBJECT (object, "stop called");
     gst_buffer_unmap (buf, &map);
     gst_buffer_unref (buf);
-    return GST_FLOW_WRONG_STATE;
+    return GST_FLOW_FLUSHING;
   }
 select_error:
   {