diff --git a/src/cfg.c b/src/cfg.c
index 620c57d8..b798e594 100644
--- a/src/cfg.c
+++ b/src/cfg.c
@@ -195,7 +195,7 @@ int kvz_config_init(kvz_config *cfg)
 
   cfg->jccr = 0;
 
-  cfg->amvr = 1;
+  cfg->amvr = 0;
 
   return 1;
 }
diff --git a/src/encode_coding_tree.c b/src/encode_coding_tree.c
index ee3552e9..826be706 100644
--- a/src/encode_coding_tree.c
+++ b/src/encode_coding_tree.c
@@ -1368,8 +1368,9 @@ void kvz_encode_coding_tree(encoder_state_t * const state,
       kvz_hmvp_add_mv(state, x, y, pu_w, pu_h, cur_pu);
     }
 
-    // imv mode, set to quarter-pel resolution
-    if (non_zero_mvd) {
+    // imv mode, select between fullpel, half-pel and quarter-pel resolutions
+    // 0 = off, 1 = fullpel, 2 = quarter-pel, 3 = half-pel
+    if (ctrl->cfg.amvr && non_zero_mvd) {
       cabac->cur_ctx = &(cabac->ctx.imv_flag[0]);
       CABAC_BIN(cabac, (imv_mode > 0), "imv_flag");
       if (imv_mode > 0) {