diff --git a/configure b/configure
index 98987ed186..c87a010387 100755
--- a/configure
+++ b/configure
@@ -3725,7 +3725,6 @@ cws2fws_extralibs="zlib_extralibs"
 # libraries, in any order
 avcodec_deps="avutil"
 avcodec_suggest="libm"
-avcodec_select="null_bsf"
 avdevice_deps="avformat avcodec avutil"
 avdevice_suggest="libm"
 avfilter_deps="avutil"
diff --git a/tools/target_bsf_fuzzer.c b/tools/target_bsf_fuzzer.c
index 56f011ad21..73bf4bdf0e 100644
--- a/tools/target_bsf_fuzzer.c
+++ b/tools/target_bsf_fuzzer.c
@@ -54,16 +54,14 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
 #define BSF_SYMBOL(BSF) BSF_SYMBOL0(BSF)
         extern AVBitStreamFilter BSF_SYMBOL(FFMPEG_BSF);
         f = &BSF_SYMBOL(FFMPEG_BSF);
-#else
-        extern AVBitStreamFilter ff_null_bsf;
-        f = &ff_null_bsf;
 #endif
         av_log_set_level(AV_LOG_PANIC);
     }
 
-    res = av_bsf_alloc(f, &bsf);
+    res = f ? av_bsf_alloc(f, &bsf) : av_bsf_get_null_filter(&bsf);
     if (res < 0)
         error("Failed memory allocation");
+    f = bsf->filter;
 
     if (size > 1024) {
         GetByteContext gbc;