diff --git a/ydb/core/protos/table_service_config.proto b/ydb/core/protos/table_service_config.proto
index d98a24fd8fb3..144ee16e31c2 100644
--- a/ydb/core/protos/table_service_config.proto
+++ b/ydb/core/protos/table_service_config.proto
@@ -279,8 +279,8 @@ message TTableServiceConfig {
     optional bool EnablePerStatementQueryExecution = 56 [default = false];
     optional bool EnableCreateTableAs = 57 [default = true];
 
-    optional uint64 IdxLookupJoinPointsLimit = 58 [default = 1];
-    optional bool OldLookupJoinBehaviour = 59 [default = true];
+    optional uint64 IdxLookupJoinPointsLimit = 58 [default = 3];
+    optional bool OldLookupJoinBehaviour = 59 [default = false];
 
     optional bool EnableOltpSink = 60 [default = false];
 
diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_range_right.sql-plan_/join_join_range_right.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_range_right.sql-plan_/join_join_range_right.sql.plan
index af346148b069..ab27c6a2d401 100644
--- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_range_right.sql-plan_/join_join_range_right.sql.plan
+++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_range_right.sql-plan_/join_join_range_right.sql.plan
@@ -29,13 +29,7 @@
                         "Key2",
                         "Value"
                     ],
-                    "lookup_by": [
-                        "Key1 (103)"
-                    ],
-                    "scan_by": [
-                        "Key2 (-\u221e, +\u221e)"
-                    ],
-                    "type": "Scan"
+                    "type": "Lookup"
                 }
             ]
         }