diff --git a/src/Storages/StorageJoin.cpp b/src/Storages/StorageJoin.cpp
index f27a76dc0dd..47e41cccc96 100644
--- a/src/Storages/StorageJoin.cpp
+++ b/src/Storages/StorageJoin.cpp
@@ -395,11 +395,14 @@ void registerStorageJoin(StorageFactory & factory)
             else if (kind_str == "full")
             {
                 if (strictness == JoinStrictness::Any)
-                    strictness = JoinStrictness::RightAny;
+                    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "ANY FULL JOINs are not implemented");
                 kind = JoinKind::Full;
             }
         }
 
+        if ((strictness == JoinStrictness::Semi || strictness == JoinStrictness::Anti) && (kind != JoinKind::Left && kind != JoinKind::Right))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, " SEMI|ANTI JOIN should be LEFT or RIGHT");
+
         if (kind == JoinKind::Comma)
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Second parameter of storage Join must be LEFT or INNER or RIGHT or FULL (without quotes).");
 
diff --git a/tests/queries/0_stateless/03197_storage_join_strictness_type_restriction.reference b/tests/queries/0_stateless/03197_storage_join_strictness_type_restriction.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03197_storage_join_strictness_type_restriction.sql b/tests/queries/0_stateless/03197_storage_join_strictness_type_restriction.sql
new file mode 100644
index 00000000000..5aa3e4c2e0c
--- /dev/null
+++ b/tests/queries/0_stateless/03197_storage_join_strictness_type_restriction.sql
@@ -0,0 +1,42 @@
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1
+(
+    a Int64,
+    b Int64
+) Engine = Join(SEMI, ALL, a); -- { serverError BAD_ARGUMENTS }
+
+CREATE TABLE t1
+(
+    a Int64,
+    b Int64
+) Engine = Join(SEMI, INNER, a); -- { serverError BAD_ARGUMENTS }
+
+CREATE TABLE t1
+(
+    a Int64,
+    b Int64
+) Engine = Join(SEMI, FULL, a); -- { serverError BAD_ARGUMENTS }
+
+CREATE TABLE t1
+(
+    a Int64,
+    b Int64
+) Engine = Join(ANTI, ALL, a); -- { serverError BAD_ARGUMENTS }
+
+CREATE TABLE t1
+(
+    a Int64,
+    b Int64
+) Engine = Join(ANTI, INNER, a); -- { serverError BAD_ARGUMENTS }
+
+CREATE TABLE t1
+(
+    a Int64,
+    b Int64
+) Engine = Join(ANTI, FULL, a); -- { serverError BAD_ARGUMENTS }
+
+CREATE TABLE t1
+(
+    a Int64,
+    b Int64
+) Engine = Join(ANY, FULL, a); -- { serverError NOT_IMPLEMENTED }