diff --git a/fleetspeak/src/server/mysql/mysql.go b/fleetspeak/src/server/mysql/mysql.go
index 06ee3cc7..1cc0fe13 100644
--- a/fleetspeak/src/server/mysql/mysql.go
+++ b/fleetspeak/src/server/mysql/mysql.go
@@ -169,10 +169,10 @@ creation_time_seconds BIGINT NOT NULL,
 creation_time_nanos INT NOT NULL,
 processed_time_seconds BIGINT,
 processed_time_nanos INT,
-validation_info BLOB,
+validation_info MEDIUMBLOB,
 failed INT1,
 failed_reason TEXT,
-annotations BLOB,
+annotations MEDIUMBLOB,
 PRIMARY KEY (message_id))`,
 		`CREATE TABLE IF NOT EXISTS pending_messages(
 for_server BOOL NOT NULL,
@@ -180,7 +180,7 @@ message_id BINARY(32) NOT NULL,
 retry_count INT NOT NULL,
 scheduled_time BIGINT NOT NULL,
 data_type_url TEXT,
-data_value BLOB,
+data_value LONGBLOB,
 PRIMARY KEY (for_server, message_id),
 FOREIGN KEY (message_id) REFERENCES messages(message_id))`,
 		`CREATE TABLE IF NOT EXISTS client_contact_messages(
@@ -196,7 +196,7 @@ message_type VARCHAR(128) NOT NULL,
 expiration_time_seconds BIGINT,
 expiration_time_nanos INT,
 data_type_url TEXT,
-data_value BLOB,
+data_value LONGBLOB,
 sent BIGINT UNSIGNED,
 allocated BIGINT UNSIGNED,
 message_limit BIGINT UNSIGNED,
@@ -226,7 +226,7 @@ FOREIGN KEY (client_id) REFERENCES clients(client_id))`,
 service VARCHAR(128) NOT NULL,
 name VARCHAR(128) NOT NULL,
 modified_time_nanos BIGINT NOT NULL,
-data BLOB,
+data LONGBLOB,
 PRIMARY KEY (service, name))
 `,
 	} {