diff --git a/src/search_intra.c b/src/search_intra.c
index df970ade..2f04552f 100644
--- a/src/search_intra.c
+++ b/src/search_intra.c
@@ -406,7 +406,7 @@ static double search_intra_trdepth(
           // Temp constraints. Updating the actual pred_cu constraints here will break things later
 
         if (constraints[0] || !constraints[1]) {
-          end_idx = 0;
+          //end_idx = 0;
           if (pred_cu->lfnst_idx > 0) {
             continue;
           }
@@ -1588,8 +1588,8 @@ int8_t uvg_search_cu_intra_chroma(encoder_state_t * const state,
   // is always one of the modes, so 2 means the final decision is made
   // between luma mode and one other mode that looks the best
   // according to search_intra_chroma_rough.
-  // const int8_t modes_in_depth[5] = { 1, 1, 1, 1, 1 };
-  int num_modes = 5;
+  // const int8_t modes_in_depth[5] = { 1, 1, 1, 1, 2 };
+  int num_modes = 1;
 
   if (state->encoder_control->cfg.rdo >= 3) {
     num_modes = total_modes;
@@ -1597,9 +1597,9 @@ int8_t uvg_search_cu_intra_chroma(encoder_state_t * const state,
 
   intra_search_data_t chroma_data[8];
   FILL(chroma_data, 0);
-  for (int i = state->encoder_control->cfg.rdo >= 3 ? 0 : 4; i < num_modes; i++) {
+  for (int i = 0; i < num_modes; i++) {
     chroma_data[i].pred_cu = *cur_pu;
-    chroma_data[i].pred_cu.intra.mode_chroma = modes[i];
+    chroma_data[i].pred_cu.intra.mode_chroma = num_modes == 1 ? intra_mode : modes[i];
     chroma_data[i].pred_cu.intra.mode = -1;
     chroma_data[i].cost = 0;
     memcpy(chroma_data[i].lfnst_costs, search_data->lfnst_costs, sizeof(double) * 3);