diff --git a/src/encode_coding_tree.c b/src/encode_coding_tree.c
index f73d875e..0a18652e 100644
--- a/src/encode_coding_tree.c
+++ b/src/encode_coding_tree.c
@@ -1738,7 +1738,6 @@ void uvg_encode_coding_tree(
       encode_transform_coeff(state, x, y, depth, 0, 0, 0, 1, coeff, tree_type);
       // Write LFNST only once for single tree structure
       encode_lfnst_idx(state, cabac, tmp, x, y, depth, cu_width, cu_height, tree_type, COLOR_UV);
-      
     }
   }
 
diff --git a/src/search_intra.c b/src/search_intra.c
index 0c2f1c40..fc73a7be 100644
--- a/src/search_intra.c
+++ b/src/search_intra.c
@@ -369,7 +369,7 @@ static double search_intra_trdepth(
           pred_cu->violates_mts_coeff_constraint = 0;
 
           if (trafo == MTS_SKIP && width > (
-                1 << state->encoder_control->cfg.trskip_max_size)) {
+                1 << state->encoder_control->cfg.trskip_max_size) || !state->encoder_control->cfg.trskip_enable) {
             //TODO: parametrize that this is not hardcoded
             // TODO: this probably should currently trip for chroma?
             continue;