diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index 3777c48e9f..9080594bfb 100644
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -698,6 +698,9 @@ static int channel_spy(struct ast_channel *chan, struct ast_autochan *spyee_auto
 	while (ast_waitfor(chan, -1) > -1 && csth.spy_audiohook.status == AST_AUDIOHOOK_STATUS_RUNNING) {
 		if (!(f = ast_read(chan)) || ast_check_hangup(chan)) {
 			running = -1;
+			if (f) {
+				ast_frfree(f);
+			}
 			break;
 		}
 
diff --git a/main/channel.c b/main/channel.c
index b35a2fad43..76b6d524ac 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -2827,14 +2827,14 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay)
 				}
 			}
 
-			if (res == 0) {
-				ast_channel_lock(chan);
-				while ((cur = AST_LIST_REMOVE_HEAD(&frames, frame_list))) {
+			ast_channel_lock(chan);
+			while ((cur = AST_LIST_REMOVE_HEAD(&frames, frame_list))) {
+				if (res == 0) {
 					ast_queue_frame_head(chan, cur);
-					ast_frfree(cur);
 				}
-				ast_channel_unlock(chan);
+				ast_frfree(cur);
 			}
+			ast_channel_unlock(chan);
 		} while (0);
 		break;
 	default: