diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 2e418ec46c..044413a50a 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1091,11 +1091,6 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
             ret = AVERROR(EINVAL);
             goto free_and_end;
         }
-
-#if FF_API_EMU_EDGE
-        /* force the emu edge flag on, since it's now always active */
-        avctx->flags |= CODEC_FLAG_EMU_EDGE;
-#endif
     }
 end:
     entangled_thread_counter--;