diff --git a/dbms/tests/queries/0_stateless/00736_disjunction_optimisation.reference b/dbms/tests/queries/0_stateless/00736_disjunction_optimisation.reference
new file mode 100644
index 00000000000..afd698b425e
--- /dev/null
+++ b/dbms/tests/queries/0_stateless/00736_disjunction_optimisation.reference
@@ -0,0 +1,90 @@
+1	21
+1	22
+1	23
+2	21
+2	22
+2	23
+3	21
+3	22
+3	23
+1	21
+1	22
+1	23
+2	21
+2	22
+2	23
+3	21
+3	22
+3	23
+1	21
+1	22
+1	23
+2	21
+2	22
+2	23
+3	21
+3	22
+3	23
+1	1	21	1	1	1
+1	1	22	0	1	1
+1	1	23	0	0	1
+2	1	21	1	1	1
+2	1	22	0	1	1
+2	1	23	0	0	1
+3	1	21	1	1	1
+3	1	22	0	1	1
+3	1	23	0	0	1
+21	1
+22	1
+23	1
+21	1
+22	1
+23	1
+21	1
+22	1
+23	1
+1	21
+1	22
+1	23
+2	21
+2	22
+2	23
+3	21
+3	22
+3	23
+1	21
+1	22
+1	23
+2	21
+2	22
+2	23
+3	21
+3	22
+3	23
+1	21
+1	22
+1	23
+2	21
+2	22
+2	23
+3	21
+3	22
+3	23
+1	1	21	1	1	1
+1	1	22	0	1	1
+1	1	23	0	0	1
+2	1	21	1	1	1
+2	1	22	0	1	1
+2	1	23	0	0	1
+3	1	21	1	1	1
+3	1	22	0	1	1
+3	1	23	0	0	1
+21	1
+22	1
+23	1
+21	1
+22	1
+23	1
+21	1
+22	1
+23	1
diff --git a/dbms/tests/queries/0_stateless/00736_disjunction_optimisation.sql b/dbms/tests/queries/0_stateless/00736_disjunction_optimisation.sql
new file mode 100644
index 00000000000..caf2af7a037
--- /dev/null
+++ b/dbms/tests/queries/0_stateless/00736_disjunction_optimisation.sql
@@ -0,0 +1,21 @@
+DROP TABLE IF EXISTS test.bug;
+CREATE TABLE IF NOT EXISTS test.bug(k UInt64, s UInt64) ENGINE = Memory;
+insert into test.bug values(1,21),(1,22),(1,23),(2,21),(2,22),(2,23),(3,21),(3,22),(3,23);
+
+set optimize_min_equality_disjunction_chain_length = 2;
+
+select * from test.bug;
+select * from test.bug where (k =1 or k=2 or k =3) and (s=21 or s=22 or s=23);
+select * from (select * from test.bug where k=1 or k=2 or k=3) where (s=21 or s=22 or s=23);
+select k, (k=1 or k=2 or k=3), s, (s=21), (s=21 or s=22), (s=21 or s=22 or s=23) from test.bug;
+select s, (s=21 or s=22 or s=23) from test.bug;
+
+set optimize_min_equality_disjunction_chain_length = 3;
+
+select * from test.bug;
+select * from test.bug where (k =1 or k=2 or k =3) and (s=21 or s=22 or s=23);
+select * from (select * from test.bug where k=1 or k=2 or k=3) where (s=21 or s=22 or s=23);
+select k, (k=1 or k=2 or k=3), s, (s=21), (s=21 or s=22), (s=21 or s=22 or s=23) from test.bug;
+select s, (s=21 or s=22 or s=23) from test.bug;
+
+DROP TABLE test.bug;