diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1758f310..8366b8f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ HEAD
 ----
 
 * Improve error messages when using `char` or `char*` (issue #2043)
+* Make string support even more generic (PR #2084 by @d-a-v)
 
 v6.21.5 (2024-01-10)
 -------
diff --git a/src/ArduinoJson/Strings/StringTraits.hpp b/src/ArduinoJson/Strings/StringTraits.hpp
index 45804cd1..9fa5577a 100644
--- a/src/ArduinoJson/Strings/StringTraits.hpp
+++ b/src/ArduinoJson/Strings/StringTraits.hpp
@@ -38,16 +38,15 @@ struct has_data<T,
                                            const char*>::value>::type>
     : true_type {};
 
-// size_t length() const
+// unsigned int length() const
 // - String
 
 template <class T, class = void>
 struct has_length : false_type {};
 
 template <class T>
-struct has_length<
-    T, typename enable_if<
-           is_same<decltype(declval<const T>().length()), size_t>::value>::type>
+struct has_length<T, typename enable_if<is_unsigned<
+                         decltype(declval<const T>().length())>::value>::type>
     : true_type {};
 
 // size_t size() const