diff --git a/apps/app_morsecode.c b/apps/app_morsecode.c
index cd42112318..aec946a098 100644
--- a/apps/app_morsecode.c
+++ b/apps/app_morsecode.c
@@ -134,11 +134,12 @@ static int morsecode_exec(struct ast_channel *chan, void *data)
 	}
 
 	for (digit = data; *digit; digit++) {
+		int digit2 = *digit;
 		char *dahdit;
-		if (*digit < 0) {
+		if (digit2 < 0) {
 			continue;
 		}
-		for (dahdit = morsecode[(int)*digit]; *dahdit; dahdit++) {
+		for (dahdit = morsecode[digit2]; *dahdit; dahdit++) {
 			if (*dahdit == '-') {
 				playtone(chan, tone, 3 * ditlen);
 			} else if (*dahdit == '.') {