diff --git a/av1/encoder/ratectrl.c b/av1/encoder/ratectrl.c
index c31baa9..56203cd 100644
--- a/av1/encoder/ratectrl.c
+++ b/av1/encoder/ratectrl.c
@@ -997,7 +997,7 @@
           get_kf_active_quality(rc, active_worst_quality, bit_depth);
 
       if (cpi->twopass.kf_zeromotion_pct >= STATIC_KF_GROUP_THRESH) {
-        active_best_quality /= 4;
+        active_best_quality /= 3;
       }
 
       // Allow somewhat lower kf minq with small image formats.
@@ -1163,7 +1163,9 @@
   active_worst_quality =
       clamp(active_worst_quality, active_best_quality, rc->worst_quality);
 
-  if (oxcf->rc_mode == AOM_Q) {
+  if (oxcf->rc_mode == AOM_Q ||
+      (frame_is_intra_only(cm) && !rc->this_key_frame_forced &&
+       cpi->twopass.kf_zeromotion_pct >= STATIC_KF_GROUP_THRESH)) {
     q = active_best_quality;
     // Special case code to try and match quality with forced key frames.
   } else if (frame_is_intra_only(cm) && rc->this_key_frame_forced) {