diff --git a/NEWS b/NEWS
index 72d6f9a3971..add6fdb57ba 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,7 @@ PHP                                                                        NEWS
 
 - MySQLnd:
   . Fix GH-13452 (Fixed handshake response [mysqlnd]). (Saki Takamachi)
+  . Fix incorrect charset length in check_mb_eucjpms(). (nielsdos)
 
 - Opcache:
   . Fixed GH-13508 (JITed QM_ASSIGN may be optimized out when op1 is null).
diff --git a/ext/mysqlnd/mysqlnd_charset.c b/ext/mysqlnd/mysqlnd_charset.c
index 802822128be..2d826002686 100644
--- a/ext/mysqlnd/mysqlnd_charset.c
+++ b/ext/mysqlnd/mysqlnd_charset.c
@@ -270,7 +270,7 @@ static unsigned int check_mb_eucjpms(const char * const start, const char * cons
 	}
 	if (valid_eucjpms_ss3(start[0]) && (end - start) > 2 && valid_eucjpms(start[1]) &&
 		valid_eucjpms(start[2])) {
-		return 2;
+		return 3;
 	}
 	return 0;
 }