diff --git a/apps/app_echo.c b/apps/app_echo.c
index 5414ee37e9baedec6324073890253e75ae0f0118..1c721106075b7ffc75a3658c9356cb0e34f6817b 100644
--- a/apps/app_echo.c
+++ b/apps/app_echo.c
@@ -62,26 +62,17 @@ static int echo_exec(struct ast_channel *chan, const char *data)
 		if (!f) {
 			break;
 		}
-		switch (f->frametype) {
-		case AST_FRAME_VOICE:
-		case AST_FRAME_DTMF:
-			f->delivery.tv_sec = 0;
-			f->delivery.tv_usec = 0;
-			if (ast_write(chan, f)) {
-				ast_frfree(f);
-				goto end;
-			}
-			if (f->frametype == AST_FRAME_DTMF) {
-				if (f->subclass.integer == '#') {
-					res = 0;
-					ast_frfree(f);
-					goto end;
-				}
-			}
-			break;
-		default:
-			break;
-		}		
+		f->delivery.tv_sec = 0;
+		f->delivery.tv_usec = 0;
+		if (ast_write(chan, f)) {
+			ast_frfree(f);
+			goto end;
+		}
+		if ((f->frametype == AST_FRAME_DTMF) && (f->subclass.integer == '#')) {
+			res = 0;
+			ast_frfree(f);
+			goto end;
+		}
 		ast_frfree(f);
 	}
 end: