diff --git a/administrator/components/com_admin/sql/updates/mysql/3.9.7-2019-05-16.sql b/administrator/components/com_admin/sql/updates/mysql/3.9.7-2019-05-16.sql
index dcfcbe2b602a6..e03422239c89e 100644
--- a/administrator/components/com_admin/sql/updates/mysql/3.9.7-2019-05-16.sql
+++ b/administrator/components/com_admin/sql/updates/mysql/3.9.7-2019-05-16.sql
@@ -1 +1 @@
-UPDATE `#__users` SET `params` = REPLACE(`params`, '"helpsite":"https:\\/\\/help.joomla.fr\\/index.php?option=com_help&keyref=Help{major}{minor}:{keyref}"', '');
\ No newline at end of file
+# Query removed, see https://github.com/joomla/joomla-cms/pull/25177
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.9.8-2019-06-11.sql b/administrator/components/com_admin/sql/updates/mysql/3.9.8-2019-06-11.sql
new file mode 100644
index 0000000000000..61d79e585edb8
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.9.8-2019-06-11.sql
@@ -0,0 +1 @@
+UPDATE #__users SET params = REPLACE(params, '",,"', '","');
\ No newline at end of file
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.9.7-2019-05-16.sql b/administrator/components/com_admin/sql/updates/postgresql/3.9.7-2019-05-16.sql
index 82fc336c95475..e03422239c89e 100644
--- a/administrator/components/com_admin/sql/updates/postgresql/3.9.7-2019-05-16.sql
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.9.7-2019-05-16.sql
@@ -1 +1 @@
-UPDATE "#__users" SET "params" = REPLACE("params", '"helpsite":"https:\\/\\/help.joomla.fr\\/index.php?option=com_help&keyref=Help{major}{minor}:{keyref}"', '');
\ No newline at end of file
+# Query removed, see https://github.com/joomla/joomla-cms/pull/25177
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.9.8-2019-06-11.sql b/administrator/components/com_admin/sql/updates/postgresql/3.9.8-2019-06-11.sql
new file mode 100644
index 0000000000000..018e8d73c3bde
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.9.8-2019-06-11.sql
@@ -0,0 +1 @@
+UPDATE "#__users" SET "params" = REPLACE("params", '",,"', '","');
\ No newline at end of file
diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.9.7-2019-05-16.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.9.7-2019-05-16.sql
index 51ddd04c2defa..e03422239c89e 100644
--- a/administrator/components/com_admin/sql/updates/sqlazure/3.9.7-2019-05-16.sql
+++ b/administrator/components/com_admin/sql/updates/sqlazure/3.9.7-2019-05-16.sql
@@ -1 +1 @@
-UPDATE [#__users] SET [params] = REPLACE([params], '"helpsite":"https:\\/\\/help.joomla.fr\\/index.php?option=com_help&keyref=Help{major}{minor}:{keyref}"', '');
\ No newline at end of file
+# Query removed, see https://github.com/joomla/joomla-cms/pull/25177
diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.9.8-2019-06-11.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.9.8-2019-06-11.sql
new file mode 100644
index 0000000000000..caefb45bd147d
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/sqlazure/3.9.8-2019-06-11.sql
@@ -0,0 +1 @@
+UPDATE [#__users] SET [params] = REPLACE([params], '",,"', '","');
\ No newline at end of file