diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/SendHandshakeResponsePacket.java b/src/main/java/org/mariadb/jdbc/internal/com/send/SendHandshakeResponsePacket.java
index b776260a9..e3de8f684 100644
--- a/src/main/java/org/mariadb/jdbc/internal/com/send/SendHandshakeResponsePacket.java
+++ b/src/main/java/org/mariadb/jdbc/internal/com/send/SendHandshakeResponsePacket.java
@@ -173,7 +173,7 @@ public static void send(
       pos.write((byte) 0);
     }
 
-    if ((serverCapabilities & MariaDbServerCapabilities.CONNECT_WITH_DB) != 0) {
+    if ((clientCapabilities & MariaDbServerCapabilities.CONNECT_WITH_DB) != 0) {
       pos.write(database);
       pos.write((byte) 0);
     }