diff --git a/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c b/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c
index f18493793a..d64101c389 100644
--- a/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c
+++ b/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c
@@ -663,7 +663,7 @@ emuxki_voice_channel_create(emuxki_voice *voice)
 	uint8	        i, stereo = voice->stereo;
 	//int             s;
 
-	for (i = 0; i < EMU_NUMCHAN; i += stereo + 1) {
+	for (i = 0; i < EMU_NUMCHAN - stereo; i += stereo + 1) {
 		if ((stereo && (channel[i + 1] != NULL)) ||
 		    (channel[i] != NULL))	/* Looking for free channels */
 			continue;
diff --git a/src/add-ons/kernel/drivers/audio/emuxki/multi.c b/src/add-ons/kernel/drivers/audio/emuxki/multi.c
index b64609d440..f29bb7e939 100644
--- a/src/add-ons/kernel/drivers/audio/emuxki/multi.c
+++ b/src/add-ons/kernel/drivers/audio/emuxki/multi.c
@@ -630,7 +630,7 @@ emuxki_list_mix_controls(emuxki_dev *card, multi_mix_control_info * MMCI)
 	uint32 i;
 	
 	MMC = MMCI->controls;
-	if(MMCI->control_count < 24)
+	if(MMCI->control_count < EMU_MULTICONTROLSNUM)
 		return B_ERROR;
 			
 	if(emuxki_create_controls_list(&card->multi) < B_OK)