diff --git a/server/modules/routing/binlog/blr_slave.c b/server/modules/routing/binlog/blr_slave.c
index 4388e2934..17440f467 100644
--- a/server/modules/routing/binlog/blr_slave.c
+++ b/server/modules/routing/binlog/blr_slave.c
@@ -376,12 +376,12 @@ int	query_len;
 			word = strtok_r(NULL, sep, &brkb);
 			if (word && (strcasecmp(word, "'none'") == 0))
 				slave->nocrc = 1;
+			else if (word && (strcasecmp(word, "@@global.biglog_checksum'") == 0))
+				slave->nocrc = !router->master_chksum;
 			else
 				slave->nocrc = 0;
 
-			if (word && (strcasecmp(word, "@@global.biglog_checksum'") == 0))
-				slave->nocrc = !router->master_chksum;
-
+			
 			free(query_text);
 			return blr_slave_replay(router, slave, router->saved_master.chksum1);
 		}