diff --git a/SECURITY.md b/SECURITY.md
index 67d8dc85c13..6d64dd2d24b 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -10,11 +10,14 @@ currently being supported with security updates:
 | 1.x   | :x: |
 | 18.x   | :x:                |
 | 19.x   | :x:                |
-| 19.14   | :white_check_mark: |
 | 20.1   | :x: |
 | 20.3   | :white_check_mark: |
-| 20.4   | :white_check_mark: |
-| 20.5   | :white_check_mark: |
+| 20.4   | :x: |
+| 20.5   | :x: |
+| 20.6   | :x: |
+| 20.7   | :white_check_mark: |
+| 20.8   | :white_check_mark: |
+| 20.9   | :white_check_mark: |
 
 ## Reporting a Vulnerability
 
diff --git a/src/Storages/MergeTree/registerStorageMergeTree.cpp b/src/Storages/MergeTree/registerStorageMergeTree.cpp
index 2b0d1a60657..f94425a81d3 100644
--- a/src/Storages/MergeTree/registerStorageMergeTree.cpp
+++ b/src/Storages/MergeTree/registerStorageMergeTree.cpp
@@ -446,7 +446,7 @@ static StoragePtr create(const StorageFactory::Arguments & args)
                     "No replica name in config" + getMergeTreeVerboseHelp(is_extended_storage_def), ErrorCodes::NO_REPLICA_NAME_GIVEN);
             ++arg_num;
         }
-        else if (is_extended_storage_def && !has_arguments)
+        else if (is_extended_storage_def && arg_cnt == 0)
         {
             /// Try use default values if arguments are not specified.
             /// Note: {uuid} macro works for ON CLUSTER queries when database engine is Atomic.
diff --git a/tests/queries/0_stateless/01512_create_replicate_merge_tree_one_arg.reference b/tests/queries/0_stateless/01512_create_replicate_merge_tree_one_arg.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01512_create_replicate_merge_tree_one_arg.sql b/tests/queries/0_stateless/01512_create_replicate_merge_tree_one_arg.sql
new file mode 100644
index 00000000000..f33c1534a44
--- /dev/null
+++ b/tests/queries/0_stateless/01512_create_replicate_merge_tree_one_arg.sql
@@ -0,0 +1,3 @@
+CREATE TABLE mt (v UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01497/mt')
+    ORDER BY tuple() -- { serverError 36 }
+