diff --git a/src/switch_core_file.c b/src/switch_core_file.c
index a1eea24ab3..84fb607398 100644
--- a/src/switch_core_file.c
+++ b/src/switch_core_file.c
@@ -399,6 +399,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_read(switch_file_handle_t *fh,
 
 	if (switch_test_flag(fh, SWITCH_FILE_DONE)) {
 		switch_clear_flag_locked(fh, SWITCH_FILE_DONE);
+		switch_clear_flag_locked(fh, SWITCH_FILE_BUFFER_DONE);
 		*len = 0;
 		return SWITCH_STATUS_FALSE;
 	}
@@ -407,7 +408,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_read(switch_file_handle_t *fh,
 
   more:
 
-	if (fh->pre_buffer && switch_buffer_inuse(fh->pre_buffer)) {
+	if (fh->pre_buffer) {
 		switch_size_t rlen;
 		int asis = switch_test_flag(fh, SWITCH_FILE_NATIVE);