diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c
index 0cd76d9c2d..44464d90b5 100644
--- a/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@ -972,7 +972,7 @@ static av_cold int encode_init_internal(AVCodecContext *avctx)
     if (ret < 0)
         return ret;
 
-    if (s->bits_per_raw_sample > (s->version > 3 ? 16 : 8)) {
+    if (s->bits_per_raw_sample > (s->version > 3 ? 16 : 8) && !s->remap_mode) {
         if (s->ac == AC_GOLOMB_RICE) {
             av_log(avctx, AV_LOG_INFO,
                     "high bits_per_raw_sample, forcing range coder\n");