diff --git a/radicale/app/__init__.py b/radicale/app/__init__.py
index be22aa00..64685090 100644
--- a/radicale/app/__init__.py
+++ b/radicale/app/__init__.py
@@ -173,8 +173,15 @@ class Application(ApplicationPartDelete, ApplicationPartHead,
                     self._validate_user_value = "strict"
                 if self._validate_path_value not in ["strict"]:
                     self._validate_path_value = "strict"
-            logger.notice("validate user value: %r (enforced by missing support of collection storage)", self._validate_user_value)
-            logger.notice("validate path value: %r (enforced by missing support of collection storage)", self._validate_path_value)
+            logger.notice("validate user value: %r (enforced by limited support of collection storage)", self._validate_user_value)
+            logger.notice("validate path value: %r (enforced by limited support of collection storage)", self._validate_path_value)
+        elif not self._storage._supports_problematic_chars or not self._storage._supports_trailing_whitespace:
+            if self._validate_user_value not in ["strict"]:
+                self._validate_user_value = "strict"
+            if self._validate_path_value not in ["strict"]:
+                self._validate_path_value = "strict"
+            logger.notice("validate user value: %r (enforced by limited support of collection storage)", self._validate_user_value)
+            logger.notice("validate path value: %r (enforced by limited support of collection storage)", self._validate_path_value)
         else:
             logger.info("validate user value: %r", self._validate_user_value)
             logger.info("validate path value: %r", self._validate_path_value)