diff --git a/server.c b/server.c
index 727666c..d1de0e4 100644
--- a/server.c
+++ b/server.c
@@ -176,7 +176,7 @@
 		fio_init_net_cmd(cmd, opcode, buf, this_len);
 
 		if (this_len < size)
-			cmd->flags |= FIO_NET_CMD_F_MORE;
+			cmd->flags = cpu_to_le32(FIO_NET_CMD_F_MORE);
 
 		fio_net_cmd_crc(cmd);
 
@@ -264,6 +264,8 @@
 
 	switch (cmd->opcode) {
 	case FIO_NET_CMD_QUIT:
+		return 1;
+	case FIO_NET_CMD_EXIT:
 		exit_backend = 1;
 		return 1;
 	case FIO_NET_CMD_ACK: