diff --git a/client/mysqldump.cc b/client/mysqldump.cc
index 811bf73ab9088..801a0497aa0d4 100644
--- a/client/mysqldump.cc
+++ b/client/mysqldump.cc
@@ -4925,8 +4925,8 @@ static int dump_all_users_roles_and_grants()
                                     "SELECT CONCAT(QUOTE(u.user), '@', QUOTE(u.Host)) AS u "
                                     "FROM mysql.user u "
                                     " /*!80001 LEFT JOIN mysql.role_edges e "
-                                    "            ON u.user=e.from_user "
-                                    "              AND u.host=e.from_host "
+                                    "            ON u.user=e.from_user COLLATE utf8mb4_general_ci "
+                                    "              AND u.host=e.from_host COLLATE utf8mb4_general_ci "
                                     "         WHERE e.from_user IS NULL */"
                                     " /*M!100005 WHERE is_role='N' */"))
     return 1;