diff --git a/sound/drivers/upisnd/upisnd_comm.c b/sound/drivers/upisnd/upisnd_comm.c
index a2ece77d7d4d39..361098324c1da8 100644
--- a/sound/drivers/upisnd/upisnd_comm.c
+++ b/sound/drivers/upisnd/upisnd_comm.c
@@ -327,7 +327,7 @@ int upisnd_comm_init(struct upisnd_instance *instance,
 
 int upisnd_comm_send_midi(struct upisnd_instance *instance, const void *data, unsigned int n)
 {
-	if (n >= UPISND_MAX_PACKET_LENGTH)
+	if (n == 0 || n >= UPISND_MAX_PACKET_LENGTH)
 		return -EINVAL;
 
 	u8 buffer[UPISND_MAX_PACKET_LENGTH];
diff --git a/sound/drivers/upisnd/upisnd_midi.c b/sound/drivers/upisnd/upisnd_midi.c
index 2f05be0b0f959b..b7fea8227bf6de 100644
--- a/sound/drivers/upisnd/upisnd_midi.c
+++ b/sound/drivers/upisnd/upisnd_midi.c
@@ -129,7 +129,7 @@ static const struct snd_rawmidi_global_ops upisnd_midi_ops = {
 
 static void upisnd_midi_in_handler(struct work_struct *work)
 {
-	int i, n, err;
+	int n, err;
 
 	printd("In handler");
 	struct upisnd_instance *instance = container_of(work,
@@ -153,8 +153,7 @@ static void upisnd_midi_in_handler(struct work_struct *work)
 		instance->midi.rx_cnt += err;
 	}
 
-	for (i = 0; i < err; ++i)
-		kfifo_skip(&instance->midi.midi_in_fifo);
+	kfifo_skip_count(&instance->midi.midi_in_fifo, err);
 
 	if (!kfifo_is_empty(&instance->midi.midi_in_fifo) &&
 	    !work_pending(&instance->midi.midi_in_handler)) {
@@ -193,25 +192,37 @@ static void upisnd_midi_out_handler(struct work_struct *work)
 		instance->midi.output_buffer_used_in_millibytes) / 1000;
 
 	u8 buffer[UPISND_MAX_PACKET_LENGTH - 1];
+	int n, batch, err;
 
 	printd("Available: %u", output_buffer_available);
-	int n = snd_rawmidi_transmit_peek(instance->midi.midi_output,
-					  buffer,
-					  min(output_buffer_available, sizeof(buffer)));
-
-	if (n > 0) {
-		printd("Peeked: %d", n);
-		snd_rawmidi_transmit_ack(instance->midi.midi_output, n);
-		n = upisnd_comm_send_midi(instance, buffer, (unsigned int)n);
-		if (n < 0)
-			printe("Error occurred when sending MIDI data over I2C! (%d)", n);
-	} else {
-		printe("snd_rawmidi_transmit_peek returned error %d!", n);
-		goto cleanup;
-	}
 
-	instance->midi.tx_cnt += n;
-	instance->midi.output_buffer_used_in_millibytes += n * 1000;
+	for (batch = 0; batch < 3; ++batch) {
+		if (output_buffer_available == 0)
+			break;
+
+		n = snd_rawmidi_transmit_peek(instance->midi.midi_output,
+					      buffer,
+					      min(output_buffer_available, sizeof(buffer)));
+
+		if (n > 0) {
+			printd("Peeked: %d (batch %d)", n, batch);
+			err = upisnd_comm_send_midi(instance, buffer, (unsigned int)n);
+			if (err < 0) {
+				printe("Error occurred when sending MIDI data over I2C! (%d)", n);
+				goto cleanup;
+			}
+			snd_rawmidi_transmit_ack(instance->midi.midi_output, n);
+
+			instance->midi.tx_cnt += n;
+			instance->midi.output_buffer_used_in_millibytes += n * 1000;
+			output_buffer_available -= n;
+		} else if (n < 0) {
+			printe("snd_rawmidi_transmit_peek returned error %d!", n);
+			goto cleanup;
+		} else {
+			break;
+		}
+	}
 
 	printd("Checking if empty %p", instance->midi.midi_output);
 	if (!snd_rawmidi_transmit_empty(instance->midi.midi_output)) {
diff --git a/sound/drivers/upisnd/upisnd_protocol.h b/sound/drivers/upisnd/upisnd_protocol.h
index 0213cf6982e27f..59beaa3e6cbfb1 100644
--- a/sound/drivers/upisnd/upisnd_protocol.h
+++ b/sound/drivers/upisnd/upisnd_protocol.h
@@ -273,7 +273,8 @@ static inline u8 upisnd_cmd_decode_length(u8 b)
 
 static inline u8 upisnd_cmd_encode(enum upisnd_cmd_type_e type, u8 size)
 {
-	return (size < UPISND_MAX_PACKET_LENGTH && size > 0) ? (type | (size - 1)) : 0xff;
+	return (size <= UPISND_MAX_PACKET_LENGTH && size > 0) ? (type | (size - 1))
+		: UPISND_CMD_INVALID;
 }
 
 static inline u8 upisnd_msg_id_encode(upisnd_msg_id_t msg_id, bool response)