diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index 877801f0ffe..f090fac2ecf 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -5388,7 +5388,10 @@ static bool remove_nonrange_trees(RANGE_OPT_PARAM *param, SEL_TREE *tree)
     if (tree->keys[i])
     {
       if (tree->keys[i]->part)
+      {
         tree->keys[i]= NULL;
+        tree->keys_map.clear_bit(i);
+      }
       else
         res= TRUE;
     }