diff --git a/gst/gsttypefind.c b/gst/gsttypefind.c
index f4e6aa7856..756e8824af 100644
--- a/gst/gsttypefind.c
+++ b/gst/gsttypefind.c
@@ -78,7 +78,6 @@ gst_type_find_register (GstPlugin * plugin, const gchar * name, guint rank,
   GstTypeFindFactory *factory;
 
   g_return_val_if_fail (name != NULL, FALSE);
-  g_return_val_if_fail (func != NULL, FALSE);
 
   GST_INFO ("registering typefind function for %s", name);
 
diff --git a/gst/gsttypefindfactory.c b/gst/gsttypefindfactory.c
index 2cb7c9a9a3..6b65461751 100644
--- a/gst/gsttypefindfactory.c
+++ b/gst/gsttypefindfactory.c
@@ -238,9 +238,8 @@ gst_type_find_factory_call_function (GstTypeFindFactory * factory,
       GST_TYPE_FIND_FACTORY (gst_plugin_feature_load (GST_PLUGIN_FEATURE
           (factory)));
   if (new_factory) {
-    g_assert (new_factory->function != NULL);
-
-    new_factory->function (find, new_factory->user_data);
+    if (new_factory->function)
+      new_factory->function (find, new_factory->user_data);
     gst_object_unref (new_factory);
   }
 }