diff --git a/server/modules/filter/masking/mysql.hh b/server/modules/filter/masking/mysql.hh
index 34fb8337e..d54227094 100644
--- a/server/modules/filter/masking/mysql.hh
+++ b/server/modules/filter/masking/mysql.hh
@@ -596,8 +596,8 @@ class ComEOF : public ComResponse
 public:
     enum
     {
-        PAYLOAD_LEN = 5,
-        PACKET_LEN  = MYSQL_HEADER_LEN + PAYLOAD_LEN
+        PACKET_LEN  = MYSQL_EOF_PACKET_LEN,
+        PAYLOAD_LEN = MYSQL_EOF_PACKET_LEN - MYSQL_HEADER_LEN
     };
 
     ComEOF(GWBUF* pPacket)