diff --git a/lib/raop_buffer.c b/lib/raop_buffer.c
index cdd199c..4fbe58a 100644
--- a/lib/raop_buffer.c
+++ b/lib/raop_buffer.c
@@ -336,6 +336,7 @@ void raop_buffer_flush(raop_buffer_t *raop_buffer, int next_seq) {
     for (int i = 0; i < RAOP_BUFFER_LENGTH; i++) {
         if (raop_buffer->entries[i].payload_data) {
             free(raop_buffer->entries[i].payload_data);
+            raop_buffer->entries[i].payload_data = NULL;   
             raop_buffer->entries[i].payload_size = 0;
         }
         raop_buffer->entries[i].filled = 0;