diff --git a/etc/mysql/conf.d/unicode.cnf b/etc/mysql/conf.d/unicode.cnf
index 8a5a01de..9f84ef85 100644
--- a/etc/mysql/conf.d/unicode.cnf
+++ b/etc/mysql/conf.d/unicode.cnf
@@ -1,4 +1,11 @@
-[mysqld]
-init-connect='SET NAMES utf8'
-character-set-server=utf8
+[client]
+default-character-set = utf8mb4
 
+[mysql]
+default-character-set = utf8mb4
+
+[mysqld]
+init-connect='SET NAMES utf8mb4'
+character-set-client-handshake = FALSE
+character-set-server=utf8mb4
+collation-server = utf8mb4_unicode_ci