diff --git a/src/backend/utils/adt/pg_locale_icu.c b/src/backend/utils/adt/pg_locale_icu.c
index ff4541a64f3..4f401a28f0d 100644
--- a/src/backend/utils/adt/pg_locale_icu.c
+++ b/src/backend/utils/adt/pg_locale_icu.c
@@ -702,7 +702,7 @@ u_strFoldCase_default(UChar *dest, int32_t destCapacity,
 					  UErrorCode *pErrorCode)
 {
 	uint32		options = U_FOLD_CASE_DEFAULT;
-	char		lang[3];
+	char		lang[ULOC_LANG_CAPACITY];
 	UErrorCode	status;
 
 	/*
@@ -712,8 +712,8 @@ u_strFoldCase_default(UChar *dest, int32_t destCapacity,
 	 * languages to enable the option.
 	 */
 	status = U_ZERO_ERROR;
-	uloc_getLanguage(locale, lang, 3, &status);
-	if (U_SUCCESS(status))
+	uloc_getLanguage(locale, lang, ULOC_LANG_CAPACITY, &status);
+	if (U_SUCCESS(status) && status != U_STRING_NOT_TERMINATED_WARNING)
 	{
 		/*
 		 * The option name is confusing, but it causes u_strFoldCase to use