diff --git a/CHANGES b/CHANGES
index f2180e408..ee4b9aa62 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,8 @@
 
 Version 8.4.0
 
+  - Fix for Bug#91550 (Bug#28297874), DatabaseMetaData specifies incorrect extra name characters.
+
   - Fix for Bug#113129 (Bug#36043145), setting the FetchSize on a Statement object does not affect.
 
   - Fix for Bug#22931632, GETPARAMETERBINDINGS() ON A PS RETURNS NPE WHEN NOT ALL PARAMETERS ARE BOUND.
diff --git a/src/main/user-impl/java/com/mysql/cj/jdbc/DatabaseMetaData.java b/src/main/user-impl/java/com/mysql/cj/jdbc/DatabaseMetaData.java
index 592a271d5..abcb59552 100644
--- a/src/main/user-impl/java/com/mysql/cj/jdbc/DatabaseMetaData.java
+++ b/src/main/user-impl/java/com/mysql/cj/jdbc/DatabaseMetaData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates.
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License, version 2.0, as published by the
@@ -2607,7 +2607,7 @@ void forEach(String dbStr) throws SQLException {
 
     @Override
     public String getExtraNameCharacters() throws SQLException {
-        return "#@";
+        return "$";
     }
 
     /**
diff --git a/src/test/java/testsuite/regression/MetaDataRegressionTest.java b/src/test/java/testsuite/regression/MetaDataRegressionTest.java
index db822d14b..366d09071 100644
--- a/src/test/java/testsuite/regression/MetaDataRegressionTest.java
+++ b/src/test/java/testsuite/regression/MetaDataRegressionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates.
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License, version 2.0, as published by the
@@ -5578,4 +5578,15 @@ void testBug96582() throws Exception {
         assertEquals(ParameterMetaData.parameterNullable, this.pstmt.getParameterMetaData().isNullable(2));
     }
 
+    /**
+     * Tests fix for Bug#91550 (Bug#28297874), DatabaseMetaData specifies incorrect extra name characters.
+     *
+     * @throws Exception
+     */
+    @Test
+    void testBug91550() throws Exception {
+        DatabaseMetaData md = this.conn.getMetaData();
+        assertEquals("$", md.getExtraNameCharacters());
+    }
+
 }