diff --git a/install/sql/mysql.sql b/install/sql/mysql.sql
index 75a831c22..2e2f8280b 100644
--- a/install/sql/mysql.sql
+++ b/install/sql/mysql.sql
@@ -1,4 +1,4 @@
-SET SQL_MODE = "";
+SET GLOBAL SQL_MODE = "";
 
 -- ----------------------------
 -- Table structure for `bb_attachments`
diff --git a/install/sql/ocelot.sql b/install/sql/ocelot.sql
index aebdc585e..83e762c18 100644
--- a/install/sql/ocelot.sql
+++ b/install/sql/ocelot.sql
@@ -1,4 +1,4 @@
-SET SQL_MODE = "";
+SET GLOBAL SQL_MODE = "";
 
 -- ----------------------------
 -- Table structure for `bb_bt_tracker`
diff --git a/install/upgrade/changes.txt b/install/upgrade/changes.txt
index 16ea92873..1976bacd1 100644
--- a/install/upgrade/changes.txt
+++ b/install/upgrade/changes.txt
@@ -43,3 +43,6 @@ ALTER TABLE `bb_posts` CHANGE `mc_comment` `mc_comment` TEXT NOT NULL DEFAULT ''
 ALTER TABLE `bb_users` CHANGE `user_sig` `user_sig` TEXT NOT NULL DEFAULT '';
 ALTER TABLE `bb_groups` CHANGE `group_signature` `group_signature` TEXT NOT NULL DEFAULT '';
 ALTER TABLE `bb_groups` CHANGE `group_description` `group_description` TEXT NOT NULL DEFAULT '';
+
+// 2.3.0.4
+SET GLOBAL SQL_MODE = "";