diff --git a/src/dsql/parse.y b/src/dsql/parse.y
index 4a115a489a..5e473addd9 100644
--- a/src/dsql/parse.y
+++ b/src/dsql/parse.y
@@ -5942,7 +5942,7 @@ int Parser::yylexAux()
 
 		for (;;)
 		{
-			if (lex.ptr >= lex.end)			// Unexpected EOS
+			if (charlen == 0 && lex.ptr >= lex.end)			// Unexpected EOS
 			{
 				hexerror = true;
 				break;