diff --git a/openam-shared/src/main/java/jp/co/osstech/openam/shared/cookie/SameSite.java b/openam-shared/src/main/java/jp/co/osstech/openam/shared/cookie/SameSite.java
index ab678dc785..ddc1c6565d 100644
--- a/openam-shared/src/main/java/jp/co/osstech/openam/shared/cookie/SameSite.java
+++ b/openam-shared/src/main/java/jp/co/osstech/openam/shared/cookie/SameSite.java
@@ -110,11 +110,11 @@ public static boolean isSupportedClient(HttpServletRequest request) {
         } else {
             for (Pattern p : ptternSet) {
                 Matcher matcher = p.matcher(userAgent);
-                if (matcher.matches()) {
+                if (matcher.find()) {
                     return false;
                 }
             }
         }
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/openam-shared/src/main/resources/SameSiteIncompatibleClient.properties b/openam-shared/src/main/resources/SameSiteIncompatibleClient.properties
index d201795ac9..7142b32508 100644
--- a/openam-shared/src/main/resources/SameSiteIncompatibleClient.properties
+++ b/openam-shared/src/main/resources/SameSiteIncompatibleClient.properties
@@ -17,5 +17,5 @@
 
 # Specify User-Agent of SameSite incompatible browsers with regular expression.
 # The property key can be any value.
-iOS_12=.*\\(iP.+; CPU .*OS 12[_\\d]*.*\\) AppleWebKit\\/.*
-macOS_10_14_Safari=.*\\(Macintosh;.*Mac OS X 10_14[_\\d]*.*\\) AppleWebKit\\/.*Version.*
+iOS_12=\\(iP.+; CPU .*OS 12[_\\d]*.*\\) AppleWebKit\\/
+macOS_10_14_Safari=\\(Macintosh;.*Mac OS X 10_14[_\\d]*.*\\) AppleWebKit\\/.*Version