diff --git a/src/common/jsonapi.c b/src/common/jsonapi.c
index 2e86589cfd8..07f69285ade 100644
--- a/src/common/jsonapi.c
+++ b/src/common/jsonapi.c
@@ -721,8 +721,8 @@ json_lex_string(JsonLexContext *lex)
 	} while (0)
 #define FAIL_AT_CHAR_END(code) \
 	do { \
-		lex->token_terminator = \
-			s + pg_encoding_mblen_bounded(lex->input_encoding, s); \
+		char	   *term = s + pg_encoding_mblen(lex->input_encoding, s); \
+		lex->token_terminator = (term <= end) ? term : end; \
 		return code; \
 	} while (0)