diff --git a/libs/openzap/mod_openzap/mod_openzap.c b/libs/openzap/mod_openzap/mod_openzap.c
index 56a23e8879..12d1664db1 100644
--- a/libs/openzap/mod_openzap/mod_openzap.c
+++ b/libs/openzap/mod_openzap/mod_openzap.c
@@ -3116,7 +3116,7 @@ SWITCH_STANDARD_API(oz_function)
 			zap_channel_command(span->channels[chan_id], ZAP_COMMAND_SET_RX_GAIN, &rxgain);
 			zap_channel_command(span->channels[chan_id], ZAP_COMMAND_SET_TX_GAIN, &txgain);
 		} else {
-			for (i = 1; i < (int)span->chan_count; i++) {
+			for (i = 1; i <= (int)span->chan_count; i++) {
 				zap_channel_command(span->channels[i], ZAP_COMMAND_SET_RX_GAIN, &rxgain);
 				zap_channel_command(span->channels[i], ZAP_COMMAND_SET_TX_GAIN, &txgain);
 			}
@@ -3149,7 +3149,7 @@ SWITCH_STANDARD_API(oz_function)
 			snprintf(tracepath, sizeof(tracepath), "%s-out-c%d", argv[1], chan_id);
 			zap_channel_command(span->channels[chan_id], ZAP_COMMAND_TRACE_OUTPUT, tracepath);
 		} else {
-			for (i = 1; i < (int)span->chan_count; i++) {
+			for (i = 1; i <= (int)span->chan_count; i++) {
 				snprintf(tracepath, sizeof(tracepath), "%s-in-c%d", argv[1], i);
 				zap_channel_command(span->channels[i], ZAP_COMMAND_TRACE_INPUT, tracepath);
 				snprintf(tracepath, sizeof(tracepath), "%s-out-c%d", argv[1], i);
@@ -3180,7 +3180,7 @@ SWITCH_STANDARD_API(oz_function)
 		if (chan_id) {
 			zap_channel_command(span->channels[chan_id], ZAP_COMMAND_TRACE_END_ALL, NULL);
 		} else {
-			for (i = 1; i < (int)span->chan_count; i++) {
+			for (i = 1; i <= (int)span->chan_count; i++) {
 				zap_channel_command(span->channels[i], ZAP_COMMAND_TRACE_END_ALL, NULL);
 			}
 		}